Merge pull request #100 from SamLau95/bugs

Bugs
Fix ordering of JS
Merge pull request #101 from SamLau95/sam/fix-timer

Fix ordering of JS
Merge pull request #102 from SamLau95/bugs

Bugs
Update student.rb
Update student.rb
Update student.rb
Merge pull request #103 from SamLau95/bugs

Bugs
whoops bug