changes to pull
Merge branch 'jim-mood4' of https://github.com/srkemper/smilendar into jim-mood4

Conflicts:
	public/stylesheets/style.css
	public/templates/hbt.js
	templates/eventItem.handlebars