Automatic world generation
Merge branch 'master' of https://github.com/andreasberneryd/Adventure-Game

Conflicts:
	Input.py
	main.py
modifyers to names
Merge branch 'master' of https://github.com/andreasberneryd/Adventure-Game