misc updates
Merge branch 'master' of github.com:JacobHacker/Snake

Conflicts:
	src/main.cpp
fix proj file under linux, misc changes