Actually added the modified main.cpp this time.
Started tracking Makefile
Merge branch 'master' of https://github.com/sboerwinkle/yolo-happiness

Conflicts:
	Makefile
	main.cpp