Merge pull request #13 from ehannes/develop

Develop
Merge branch 'develop'

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/custom.css.scss
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/booking.html.erb
	app/views/pages/home.html.erb
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb
	db/seeds.rb
	spec/rails_helper.rb
Removed old specs
Added config/secrets.yml to gitignore
Merge branch 'master' into booking