try to resolve merge problem
Merge branch 'cosmetic_changes'

Conflicts:
	app/assets/images/ore.png