aa
Merge branch 'master' of https://github.com/lrmymycn/GdayRhodes

Conflicts:
	www/js/controllers/homeController.js