Fix things up
Make everything together
Merge branch 'master' of https://github.com/niode/cpsc433