styles, updated views html
Merge branch 'master' of https://github.com/kylegong/eventboom

Conflicts:
	client/app/scripts/mock_data.js