Merge branch 'master' of github.com:PandaGotFiles/SchinkenRepo

Conflicts:
twentyten/style.css
wtf.php