Update Gemfile.lock for Heroku
Add a StaticPages controller
updated gemfile
rspec install
fixed secret_token file
Merge branch 'static-pages'
Merge branch 'master' of https://github.com/nayr/first_app

Conflicts:
	config/initializers/secret_token.rb