updates
Merge branch 'master' of https://github.com/ap-andrew/DevGuide