:)
Merge branch 'master' of https://github.com/SerriLaw/SDP-TeamHD into development
Merge branch 'development' of https://github.com/SerriLaw/SDP-TeamHD into development
refactor/clean up of folder structure