Initial commits
static pages
Merge branch 'master' of https://github.com/HassanAkram/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	config/initializers/secret_token.rb
	config/routes.rb