Merge branch 'newmaster' into Johnny!

* newmaster:
  toilet works for the most part
  turned toilet water into shit and updated title screen. Also added piss to toilet icon
  all sorts of stuff
Merge remote-tracking branch 'origin/Johnny!' into newmaster