Fixed some bugs for loading/saving

Mostly stopping array casting
Merge branch 'master' of https://github.com/nwcaldwell/chokinghazard

Conflicts:
	src/models/Cell.java
	src/models/OneSpaceTile.java
	src/views/GameFrame.java