Various updates.
Merge branch 'master' of https://github.com/dranger003/project-14

Conflicts:
	Makefile
	main.c