did some wicked stuff with some methods
Merge branch 'master' of https://github.com/karlaugsten/CPSC433
Merge branch 'master' of https://github.com/karlaugsten/CPSC433