first commit
Merge branch 'master' of https://github.com/mantor3000/mantor3000.github.com