Added punching in the air

You can now punch in the air during either the first or second jump, but
I've added that you can't punch during the first jump and THEN jump
again.
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/github/uglypotatoguy/entities/Player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/github/uglypotatoguy/entities/Player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/github/uglypotatoguy/entities/Player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/github/uglypotatoguy/entities/Player.java