before merge
Merge branch 'master' of https://github.com/h-wang94/cs184final

Conflicts:
	main.cpp