formatting
Merge branch 'earlier-messaging' of https://github.com/gooftroop/CS6310P2 into earlier-messaging

Conflicts:
	src/view/View.java
	src/view/widgets/GridDisplay.java

Attempted to fix all conflicts. Tested - everything works