more updates
Merge branch 'master' of https://github.com/signal-intrusion/potluck-planner

Conflicts:
	css/styles.css
Merge branch 'master' of https://github.com/signal-intrusion/potluck-planner