updated readme
.
did some hitboxes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ShiftWorld/ShiftWorld/Player.cs
fix