Magic
Merge branch 'master' of https://github.com/pianohacker/csci580

Conflicts:
	src/main.cc