test
load rocks.png properly in css
add building buildings
Merge origin/dev into dev