Asset Management - neue Grafiken
Merge branch 'master' of https://github.com/dmke/GGJ2013
Merge branch 'master' of https://github.com/dmke/GGJ2013
Merge branch 'master' of https://github.com/dmke/GGJ2013

Conflicts:
	src/custom/hearty.lua
	src/custom/myObstacles.lua
Conflict resolved
obstacles weiter verteilen und Grafik-Gefummel