Added colliders on Tile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Player.cs