Remove old code
Fix some bugs
Merge branch 'master' of github.com:mokkan/CS460Proj3
Merge https://github.com/mokkan/CS460Proj3

Conflicts:
	main.c