events migration
Merge branch 'master' of https://github.com/sunnyera/singingalong

Conflicts:
	public/styles/home.css
pg