dumass macbookpro change2
stuff
fixed merge
ammended title
Merge branch 'master' of https://github.com/LzrBim/blanksite