better picz
Merge branch 'master' of https://github.com/kylegong/eventboom

Conflicts:
	client/app/index.html