All the stuff
Merge branch 'master' of http://github.com/patrick478/SWEN301-KPSmart