version 1.2
Merge branch 'master' of https://github.com/sheez44/my_homepage