Fixed errors, rearranged files
Merge branch 'master' of https://github.com/DanielJCampbell/Thesis-Management

Conflicts:
	website/StudentDB.php