Added bootstrap and applied some layout
Merge branch 'master' of https://github.com/andrewgoddard/movingstop

Conflicts:
	.gitignore
	app/assets/javascripts/testimonials.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/testimonials.css.scss
	app/views/layouts/application.html.erb
	app/views/testimonials/index.html.erb
	config/initializers/secret_token.rb
	db/schema.rb

"git commit"