derping
Merge branch 'dev' of https://github.com/the-hobbes/etsStudentTechManagement into dev
bootscrap cleaned up and commented