start of shop
Merge branch 'master' of github.com:LemDes/LD29
begining shop
Merge branch 'master' of github.com:LemDes/LD29

Conflicts:
	src/entities/Ship.hx
shop gui ok
Merge branch 'master' of github.com:LemDes/LD29

Conflicts:
	src/entities/Ship.hx