Rgeg
Merge branch 'master' of https://github.com/Roshan931/Shoutfit

Conflicts:
	www/js/index.js