idkwtf this is
adfasdfsdfsdf
wtf
Merge branch 'master' into doowon_kang

Conflicts:
	config/routes.rb
	db/schema.rb