catmit
Merge branch 'master' of https://github.com/isundaylee/beaverdash

Conflicts:
	app/views/static_pages/homepage.html.erb