Sync
Merge branch 'master' of https://github.com/EthanBlackburn/mazeRPG

Conflicts:
	bin/.gitignore