little clean up on my stuff
Merge branch 'master' of https://github.com/JohnPayment/TurboHipsterPhone

Conflicts:
	Code/Configurator/nbproject/private/private.properties
Merge branch 'master' of https://github.com/JohnPayment/TurboHipsterPhone

Conflicts:
	.gitignore