Steve Awodey 2c97f5cef7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # group_theory/basic.hlean		2016-01-21 14:27:14 -05:00
..
basic.hlean	Merge remote-tracking branch 'origin/master'	2016-01-21 14:27:14 -05:00
constructions.hlean	Merge remote-tracking branch 'origin/master'	2016-01-21 14:27:14 -05:00