small changes to appearance
trying to fix conflict
Merge branch 'develop' into origin/Master-both
Merge branch 'feature/site' into origin/Master-both
to resolve conflict due to page reorganization, reformatted private/view/homework.php (probably destroyed history clarity)
resolved merge related to status in view/private/homework.php
Fix for diff viewer ignoring whitespace
Show hide diff viewer sections
Cleaning up show/hide scores. Total shows points_received_graded / points_visible
Added hidden test cases to actually be hidden
started to work on rlimit
Fixed refresh check bug
Merge branch 'origin/Master-both' of github.com:JFrei86/HWserver into origin/Master-both
Fixing auto refresh to work with other output
Hidden test case fix. Grey bubble score size fix. Hidden text fix.
Replaced status popups with on page messages. Submissions used on page.
Support for uploading .cpp .h .txt and .py files
Change php auth
Merge branch 'origin/Master-both' into develop

* origin/Master-both:
  Change php auth
  Support for uploading .cpp .h .txt and .py files
  Replaced status popups with on page messages. Submissions used on page.
  Hidden test case fix. Grey bubble score size fix. Hidden text fix.
  Fixing auto refresh to work with other output
  Fixed refresh check bug
  started to work on rlimit
  Added hidden test cases to actually be hidden
  Cleaning up show/hide scores. Total shows points_received_graded / points_visible
  Show hide diff viewer sections
  Fix for diff viewer ignoring whitespace
  to resolve conflict due to page reorganization, reformatted private/view/homework.php (probably destroyed history clarity)
  small changes to appearance

Conflicts:
	public/index.php