testing
deleted test file
Merge branch 'master' of https://github.com/setrapp/jetpack into Physics
Merge branch 'master' of https://github.com/setrapp/jetpack into Physics
Merge branch 'master' of https://github.com/setrapp/jetpack into Physics
Added and Linked Bullet. (Can't include it yet, though. Ambiguous overloads between DirectX and Bullet, will fix when I return.)
Merge branch 'Physics' of https://github.com/setrapp/jetpack into Physics
Merge branch 'master' of https://github.com/setrapp/jetpack into Physics
Still getting errors. Bullet libs compiled in /MTd and directX in /MDd. What do?
Got Bullet working with the project. Need to verify if gravity works.
Unignoring build/ folder for now.
built libs
Merge branch 'Physics' into merge

Conflicts:
	Jetpack Jetpack Party DX11/DirectX11_Starter/DemoGame.cpp
	Jetpack Jetpack Party DX11/DirectX11_Starter/DemoGame.h
	Jetpack Jetpack Party DX11/DirectX11_Starter/DirectX11_Starter.vcxproj.filters
	Jetpack Jetpack Party DX11/DirectX11_Starter/Entity.h
	Jetpack Jetpack Party DX11/DirectX11_Starter/Player.cpp
Merge branch 'master' of https://github.com/setrapp/jetpack into merge

Conflicts:
	Jetpack Jetpack Party DX11/DirectX11_Starter/DemoGame.cpp
	Jetpack Jetpack Party DX11/DirectX11_Starter/Entity.cpp