many changes later, code is now functional, for real
Merge branch 'master' of https://github.com/pmsc73/cs3716.git