Initial Commit
Improved the README
add precompiled assets for heroku
Add precompiled assets for Heroku
Added a StaticPages Controller and their Views
Done with Static Pages
Finish static pages
Finish static pages
Merge branch 'master' of https://github.com/nolimel-git/sample_app

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/application.rb
	config/routes.rb
	config/secrets.yml
	spec/spec_helper.rb