changes
Merge branch 'master' of github.com:yeldarby/phonetroller
my merge

Conflicts:
	webroot/games/.DS_Store
	webroot/games/racermaster/index.php
	webroot/styles/Main.css