fixed problems with pull
Merge branch 'master' of git://github.com/mladmon/cs108-project