Setting up miner stuff
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/main.js
Miner progress
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/main.js
Bug fix
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29
Miner progress
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/level/miner.js