Push to heroku
Database
Merge branch 'master' of heroku.com:rogue-tattoo

Conflicts:
	.gitignore