initial commit
fixed gemfile
Add a StaticPages controller
Finish static pages
Merge branch 'master' of github.com:ehansh/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb