cs3113 assignment 1
Merge branch 'master' of https://github.com/danielgeng/cs3113

Conflicts:
	main.cpp