Readded some tile checking functionality after verifying
Merge branch 'master' of github.com:nwcaldwell/chokinghazard
Fixed Capitalization
fixed player view bug
merging
Merge branch 'master' into mauricio

Conflicts:
	src/models/Game.java