updated some errors and adding new functions
Merge branch 'master' of git://github.com/skeweredlogic/CS490

fixed some things, added some stuff