misc changes
Merge branch 'master' of https://github.com/DavidSchirduan/davidschirduan.github.com