Minor camera style error; made FPS counter prettier
Merge remote-tracking branch 'origin/master'

Conflicts:
	Window.cs