some changes
Merge branch 'master' of https://github.com/shidh/shidh.github.io