added player functionality
merged with aaron
Added pick up, drop, swap and use player functionality
more pick up changes
skldfsdfkhblah descriptive commit message
Merge remote-tracking branch 'origin/shervin' into aaron

Conflicts:
	UnityVS.GGJ14.v11.suo
GridGame