discard this
Merge branch 'master' of https://github.com/alisteroz/treehouse

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	app/views/statuses/index.html.erb
PLZ WORK