Reverted lost changes
Merge branch 'master' of https://github.com/apfestin/CS192DCS

Conflicts:
	application/models/gradefile_parser.php
	application/views/restore_response.php