Merge pull request #2 from conkerbot/MainWindow

Implemented a main window, with fps, current pitch and last pitch flags
A bit of tidying up
Allow no arguments to be passed. Should fix #3
Merge branch 'AxisLine'

Conflicts:
	VoiceOfGod/graphics/MainWindow.java
	VoiceOfGod/graphics/VOGWindow.java
	VoiceOfGod/main/VoiceOfGod.java
Merge branch 'AxisLine'

Conflicts:
	VoiceOfGod/graphics/MainWindow.java
Hitting esc will now end the game.
Cherry-picked as I can't checkout that branch for some reason. Sorry.

Conflicts:
	VoiceOfGod/graphics/MainWindow.java
	VoiceOfGod/graphics/VOGWindow.java
Merge branch 'master' into trebuchet

Conflicts:
	VoiceOfGod/graphics/MainWindow.java
	VoiceOfGod/graphics/VOGWindow.java