First deployment
Merge branch 'master' of github.com:yock/yarnbarn

Conflicts:
	config/database.yml