Updated Jump

Changed jump values in editor to give better jump, player can jump
roughly their own height (allows for player to walk under platforms, and
not cause collision with head)
scene created to store jump values and layout.
Scripts changed: movementScript
also tested mild platforming, platforming will work as long as platforms
have "Frictionless" physics 2d material attached, stops the player from
sticking to the side of the platform if they happen to hit it.
Added Pickups

Pickups have been added, they increment an int in the players
inventory, and then delete themselves.
still need some work, then only increment the can int and not their own
type.
Added movable Objects

press L to lift binbagguy, press L again to drop him
also renamed scene to alex's scene
changed stuff in the following scripts:
movementScript
(new script) objectMovementScript
Pickups nearly done and UI

Added pickups that add to a visible UI
still nothing to do with pickups, but they are clearly displayed
health redone coming next (moving UI int the UI script)
merged Zoltans and Latest

had to alter movement script as there was a merge conflict
movement is fixed

when merged, the jump stopped working this commit fixed that
now movement is fixed (clearly wasnt last time)

same as before, but true now
added a scene with shooting, enemies, moving platform
Massive stuff!

Created a version or Erins level, nowhere near in depth enough yet.
added a few scripts and moved the file order around properly
added locked door(need all trash to get past)
added all of our code into the once scene and made it playable.
Prototype shown

moved ui stuff to look better during showing, will improve script to
make it change depending on resolution
djsgcuya

vnsfhbgsifw
Merge remote-tracking branch 'origin/LatestBuild' into ZoltanBranch