just ckecked out master made no changes to really commit
Merge branch 'master' of github.com:joshuamaxwell/GroupProject1