Includes a message explaining the failing test thing
Merge branch 'master' of github.com:cookieshq/cookieshq-rails-template

Conflicts:
	template.rb