test
Merge branch 'master' of https://github.com/emorystrother/git_help

Conflicts:
	app/views/layouts/application.html.erb