commit in order to pull new code from github
Merge branch 'master' of https://github.com/bsanders/softeng
small commit to prepare for code merge
resolved conflict with Moe's code