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