final shit
Merge branch 'master' of github.com:EthanGould/Texchange

Conflicts:
	app/assets/stylesheets/application.css