Merge branch 'master' of git://github.com/suppayami/pyRPG into suppayami-master

Conflicts:
	data/Actors.txt
	data/Enemies.txt
	datamanager.py
	structure/game_actor.py
	structure/game_enemy.py
Auto determine line endings