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

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