- fixed all warnings and errors.

------------------------------------------ Stuff To Do -----------------------------------------------
- Write
- Write Ryan's Diary
- Write Class Files
- Draw UML
- fixed all warnings and errors.

------------------------------------------ Stuff To Do -----------------------------------------------
- Write
- Write Ryan's Diary
- Write Class Files
- Draw UML
Merge branch 'master' into nikhil

Conflicts:
	src/model/Cell.java
	src/model/CellInterface.java
	src/model/Grid.java
	src/model/GridInterface.java
	src/model/Puzzle.java