Trying to update project so that it's easibly downloadable.
Merge branch 'master' of https://github.com/KevinKrames/Project1.git

Conflicts:
	Project1/.cproject
	Project1/.project