Merge conflict
Merge branch 'master' into front_end

Conflicts:
	js/app.js
Fix progress icon
Fix prompt, now sticks to bottom
Merge pull request #8 from jdavis/front_end

Fix up UI a bit