2-5 stuff
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30

Conflicts:
	js/main.js
getting snake pit to work
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/beersbr/ludum_dare_30