added a bunch of stuff
Merge branch 'master' of http://github.com/ahwitcher/cs275-lab03