merge
Merge branch 'master' of github.com:newincpp/kaboom

Conflicts:
	Loader.cpp
add models
add models