Merge remote-tracking branch 'upstream/master'
merging item fix from Damien

merging Damiens fix for items in GamePlayStateMachine.cs
Merge branch 'master' of https://github.com/GSP362DeVryNov2014/TheTraveler
Merge pull request #72 from brentspector/master

Fixed variable and string errors
Merging Brents Item and Added Item Button

Brent is having issues with AddPlayer() initializing too early possibly.
Merging his PR to take a look.
Merge branch 'master' of https://github.com/GSP362DeVryNov2014/TheTraveler
Added Game Ending Collision

The market houses have collision set to them.
The player has the rigidbody/collider added to them.
Collision functionality added.
Merge pull request #73 from drobbs/master

Added Game Ending Collision
FIXED addItem bug

addItem( ) was adding object at Start but was not loading into the GUI.
I created a new initializing function called InitAfterStart( ).
Initial fix for the conflicts of PR#74
Final fix for PR#74
Merge pull request #75 from GSP362DeVryNov2014/pr/74

PR#74 Fixed Conflicts