temp commit
Merge branch 'master' of github.com:banada/sunview_rpg

Conflicts:
	init.py