init
Merge branch 'master' of https://github.com/shmay/shmay.github.com