Renaming tipsy 1
Renaming tipsy 2
Merge branch 'master' of https://github.com/samheather/pwninjas