cleaning up 1
Merge branch 'master' of https://github.com/randomlyskewed/tulip_scraps