setup items removed hard coded stuff
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30

Conflicts:
	js/main.js