begin phase2
Merge branch 'version2' of https://github.com/simeydotme/simey.me into version2