Updates from server
Merge branch 'master' of https://github.com/schmidtg/schmidtg.com