Trololol
Merge remote-tracking branch 'origin/master'

Conflicts:
	Haskore2010/autoComp.lhs