who knows what
Merge branch 'master' of https://github.com/patrickreynolds/hackmit_bueller

Conflicts:
	app/assets/stylesheets/bootstrap.css
	tmp/cache/assets/development/sprockets/05307666b626ddfa9efc97cd72e36bbf
	tmp/cache/assets/development/sprockets/aa61726715c46ea17a59c216bcadaa29
asdfa