Ffff
dasdads
sdfsdfsdf
Merge branch 'master' of https://github.com/Roshan931/Shoutfit

Conflicts:
	.gitignore
	platforms/ios/www/css/menu.css
	platforms/ios/www/js/menu.js
	www/css/menu.css
	www/html/friends.html
	www/js/menu.js
	www/js/search.js