stupid stuff
Merge branch 'master' of https://github.com/VicZens/appProj

Conflicts:
	App/App.pde