Yo hello this is a random commit to fix my stash breakage
Merge branch 'master' of http://github.com/JonasT/Blitwizard into jonas

Conflicts:
	src/physicsinternal.cpp
	src/physicsinternal.h
Adding stamp-* files (autoconf for config.h apparently) to .gitignore
Merge remote-tracking branch 'upstream/jonas' into physics_api_fix_readable_2013-05-03

Conflicts:
	src/physicsinternal.cpp
Minor fixes. Code does not compile as of now.
Merge branch 'physics_api_fix_readable_2013-05-03' into physics_api_fix_readable_2013-05-25
Began implementation of physics.cpp.
Completed preliminary and largely untested implementation of cached physics objects.
Merge remote-tracking branch 'upstream/master' into physics_api_fix_readable_2013-05-25
Added TODO remark.
Finished preliminary caching thing, this time for realz. Still untested.
Merge remote-tracking branch 'upstream/master' into physics_api_fix_readable_2013-05-25
Added (untested, of course) ability to delete objects from within callbacks.
Reenabling unloading of unused textures so I can debug it
Removed obsolete TODO remark and set weirdly written function physics_get2dAngularVelocity() right.
Merge remote-tracking branch 'upstream/master' into physics_api_fix_readable_2013-05-25

Conflicts:
	.gitignore
Starting to implement joints.
Embarassing. But you have to start somewhere...
Merge remote-tracking branch 'upstream/master' into physics_api_fix_readable_2013-05-25
Merge remote-tracking branch 'upstream/master' into physics_api_fix_readable_2013-05-25