More commits...
commit
commit
Merge branch 'master' of https://github.com/codetinkerhack/hello_rpg

Conflicts:
	.cache
	app/assets/javascripts/scenes.js
commit resolved conflicts