main.cc
Merge branch 'master' of https://github.com/chrisplyn/cs246

Conflicts:
	main.cc