working very slowly
no more useless files
cleaned up code
hmm, I did need it
whatever
Merge branch 'master' of https://github.com/z-neil/Ecse-428