Commit
Merge branch 'master' of https://github.com/Mikelao9374/ProjectOne

Conflicts:
	ProjectOne.cbp
	ProjectOne.layout