Changed nothing.
AI package
added controller inputs and music
added music files
asd
Player enemy collision.
Everything.
merged
Merge branch 'mag' into develop
Data files.
fixed that sounds killed the music
Merge branch 'henrik' into develop
as
Merge branch 'hjhhjjj_branch' into develop

Conflicts:
	src/gamejam10/character/Player.java
	src/gamejam10/level/Level.java
	src/gamejam10/states/GameState.java
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/character/Player.java
	src/gamejam10/physics/Physics.java
Changed y offset.
Falling of world!