Removing generated route from routes.rb since we have our own
Use Bootstrap 3 via sass and gem bootstrap-sass
Adding Bootstrap sass, navbar and customizations
Tweaking NavBar Background color
Including secrets.yml in git, since we'll abstract out all secret keys to .env
Including secrets.yml

Remember to put all API keys and production secrets in .env when we add that
Using link_to helper for navbar link
Adding compile and serve assets
Merge branch 'heroku' of github_stujo:stujo/rails_4_app_tutorial into heroku

Conflicts:
	app/views/layouts/application.html.erb