pulled stuff
Merge branch 'master' of https://github.com/simplydragons/simplydragons.github.com