Here come the clones
Trying to fix spring
Merge branch 'Johnny!' of https://github.com/torrmercury/GlobalGameJam2014

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
stuff with collision
Merge branch 'master' into Johnny!

* master:
  Added Bathroom
  Hopefully fixed the spring animation?
  added sounds in new sounds folder in prototype

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
I hate the spring
Merge remote-tracking branch 'origin/Johnny!' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Merge remote-tracking branch 'origin/romans-design' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Merge branch 'newmaster' into Matt
Taggin’ dat wood
Merge pull request #24 from torrmercury/Johnny!

Taggin’ dat wood
No more clones.
Merge pull request #25 from torrmercury/Johnny!

No more clones.
Created title screen and GUI ability
Merge branch 'Matt' into newmaster
added toilet water and logo
Added logo and and toilet water again?
Merge branch 'newmaster' into romans-design

* newmaster:
  Created title screen and GUI ability
  No more clones.
  I hate the spring
started working on title screen