Changes
Merge branch 'master' of github.com:chrismayu/restore-the-chief-app

Conflicts:
	app/views/home/index.html.erb