Merge branch 'master' of github.com:hpsu/home