bug update
Merge branch 'master' of github.com:lipry/RogueLikeTest

Conflicts:
	BugsDocument.txt