Player hitbox resizing
Merge branch 'master' of https://github.com/dvera2/ggj2014

Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scripts/Character.cs
Merge branch 'master' of https://github.com/dvera2/ggj2014