testing some edits
Merge branch 'master' of http://github.com/Errth/Errth.github.io