Created BlockMap class.  Added maploader to generate maps. Refactored code.
Created BlockMap class.  Added maploader to generate maps. Refactored code.
Merge branch 'TileMapConversion'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Main.java
	src/com/gmail/robmadeyou/Entity/Npc.java
	src/com/gmail/robmadeyou/Entity/Player.java
	src/com/gmail/robmadeyou/Item/Item.java
Ran code inspection. Merged branch with robmadeyou main branch.