final project campusinfo

this is the final commit of my project campusinfo
Merge branch 'master' of https://github.com/PhilipVis/Campusinfo