throwaway
Merge branch 'master' of https://github.com/samvantran/ybr

Conflicts:
	app/controllers/root_controller.rb
	app/views/homepage.erb
Merge branch 'master' of https://github.com/samvantran/ybr
Merge branch 'master' of https://github.com/samvantran/ybr
this shit is amazing