preparing for deploy
Merge branch 'master' of https://github.com/kahny/groupproject
adding folders