Added WindowManager.
Fixed formatting.
Fixed this to refer to the grading version.
Merge remote-tracking branch 'upstream/master'