Just a few updates
Merge branch 'master' of https://github.com/istbarp/dmaa0912grp4