reformated project
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/textures/debug_collision.png
	assets/textures/enemies/enemy_ship_0.png
	assets/textures/player/player_bullet_0.png
	assets/textures/player/player_ship.png
	assets/textures/texture_unknown.png
	lib/google-gson-2.2.4/gson-2.2.4.jar
	lib/jbullet-20101010/jbullet.jar
	lib/lwjgl-2.9.1/jar/lwjgl.jar
	lib/lwjgl-2.9.1/jar/lwjgl_util.jar
	lib/lwjgl-2.9.1/jar/slick.jar
	lib/lwjgl-2.9.1/native/OpenAL32.dll
	lib/lwjgl-2.9.1/native/OpenAL64.dll
	lib/lwjgl-2.9.1/native/jinput-dx8.dll
	lib/lwjgl-2.9.1/native/jinput-dx8_64.dll
	lib/lwjgl-2.9.1/native/jinput-raw.dll
	lib/lwjgl-2.9.1/native/jinput-raw_64.dll
	lib/lwjgl-2.9.1/native/libjinput-osx.jnilib
	lib/lwjgl-2.9.1/native/liblwjgl.jnilib
	lib/lwjgl-2.9.1/native/lwjgl.dll
	lib/lwjgl-2.9.1/native/lwjgl64.dll
	lib/lwjgl-2.9.1/native/openal.dylib
	src/com/skettios/bullethell/BulletHell.java
	src/com/skettios/bullethell/Start.java
	src/com/skettios/bullethell/loader/BulletHellAssetLoader.java
	src/com/skettios/bullethell/loader/BulletHellLibLoader.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/textures/debug_collision.png
	assets/textures/enemies/enemy_ship_0.png
	assets/textures/player/player_bullet_0.png
	assets/textures/player/player_ship.png
	assets/textures/texture_unknown.png
	lib/google-gson-2.2.4/gson-2.2.4.jar
	lib/jbullet-20101010/jbullet.jar
	lib/lwjgl-2.9.1/jar/lwjgl.jar
	lib/lwjgl-2.9.1/jar/lwjgl_util.jar
	lib/lwjgl-2.9.1/jar/slick.jar
	lib/lwjgl-2.9.1/native/OpenAL32.dll
	lib/lwjgl-2.9.1/native/OpenAL64.dll
	lib/lwjgl-2.9.1/native/jinput-dx8.dll
	lib/lwjgl-2.9.1/native/jinput-dx8_64.dll
	lib/lwjgl-2.9.1/native/jinput-raw.dll
	lib/lwjgl-2.9.1/native/jinput-raw_64.dll
	lib/lwjgl-2.9.1/native/libjinput-osx.jnilib
	lib/lwjgl-2.9.1/native/liblwjgl.jnilib
	lib/lwjgl-2.9.1/native/lwjgl.dll
	lib/lwjgl-2.9.1/native/lwjgl64.dll
	lib/lwjgl-2.9.1/native/openal.dylib
	src/com/skettios/bullethell/BulletHell.java
	src/com/skettios/bullethell/Start.java
	src/com/skettios/bullethell/loader/BulletHellAssetLoader.java
	src/com/skettios/bullethell/loader/BulletHellLibLoader.java