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

Conflicts:
	Level.py
Merge branch 'master' of https://github.com/andreasberneryd/Adventure-Game
Merge branch 'master' of https://github.com/andreasberneryd/Adventure-Game

Conflicts:
	Level.py