bang bang forward progress
Merge branch 'master' of github.com:weshack/WesPlan

Conflicts:
	static/css/main.css
	static/js/main.js