Merge branch 'studentassignment' of https://github.com/Capstone-F13/CS-1-Web into studentassignment

Conflicts:
	instructor/list_of_assignments.php
	student/results.php
Revert "Merge branch 'studentassignment' of https://github.com/Capstone-F13/CS-1-Web into studentassignment"

This reverts commit 784f167c34544235201f58109dfb5a166582be3c.