#100 assigned filter added
Merge branch 'develop' of github.com:railsrumble/r13-team-357 into develop

Conflicts:
	app/assets/stylesheets/application.css.sass