Updating the guides
Merge branch 'master' of github.com:groupbuddies/guides