Initial grid formatter work.
Merge branch 'master' of github.com:vilhalmer/CalendarThing

Conflicts:
	src/CalendarFormatter.java
Fixed my screwed-up merge. Learning!