init
Merge branch 'master' of github.com:dcvezzani/hairy-happiness

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb