Fix for null check on main window
Merge branch 'master' of https://github.com/MarkWesterhoff/timeflecks

Conflicts:
	src/core/Timeflecks.java