get merged
Merge branch 'master' of https://github.com/HashAppsLabs/HajjAndOmra

Conflicts:
	app/controllers/aboutApp.js