merge
Merge branch 'master' of https://github.com/arvidsson/allegro_framework

Conflicts:
	allegro_framework.c