committing before pulling data

No major changes
Merge branch 'master' of https://github.com/BDKNS/CS109Project2014