merge
Merge branch 'master' of https://github.com/nlblunt/rogue_tattoo

Conflicts:
	db/development.sqlite3