Merge branch 'master' of https://github.com/NickMilligan/Legislately

Conflicts:
	app/css/index.css