camelCase
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	MyTeamMate/assets/www/css/style.css