Settings screen
Merge branch 'master' of github.com:aaronlifshin/meetingpulse

Conflicts:
	css/meetingpulse.css
	html/presenter.html