roadmap stage 6
Merge branch 'master' of https://github.com/xosnitc/xosnitc.github.com