Consolidated commits from when I was tired and trying to fix a bug
; (+5 squashed commits)
Squashed commits:
[872c823] Fx
[801f08d] Lame bugfix
[18d800b] Anti-bugfix
[1b94a2a] A
[8d79491] a

Lame bugfix

;
ta grading
Revert "ta grading"

This reverts commit 8610cd838f28693ce25dc6f0b52be5d490fbd68c.
ta grading
Updates & merge
Fixes
AAAAAAAAND IT'S A WRAP!
Sync with end of hackathon
Merge branch 'master' of https://github.com/nickles-lee/jhack_jgrader

# By Nick Lee (9) and aaliani (3)
* 'master' of https://github.com/nickles-lee/jhack_jgrader:
  AAAAAAAAND IT'S A WRAP!
  Fixes
  Updates & merge
  ta grading
  Revert "ta grading"
  ta grading
  a
  ;
  Fx
  Lame bugfix
  Anti-bugfix
  A