Fix the WaveProgress UI
Merge branch 'master' of https://github.com/iegamejams/shiftgame into DigiTec

Conflicts:
	js/WaveGenerator.js
	shift.htm