menu
Merge branch 'master' of github.com:floored/smswoop

Conflicts:
	public/index.html
	public/js/index.js
menu