Remove old code
Fix some bugs
Merge https://github.com/mokkan/CS460Proj3

Conflicts:
	main.c