Added items and player collision.
Merge branch 'master' of https://github.com/lucaswolford/GlobalGameJam2014