lots of updates since last commit
Merge branch 'master' of git://github.com/skeweredlogic/CS490