stuff
Merge branch 'master' of github.com:glamb/glamb.github.io