first commit
Merge branch 'master' of github.com:mashtheweb/mashtheweb.github.com
second commit