Audited Code
Merge branch 'dev-team3' of https://github.com/Tommzy/wpi-suite into dev-team3