sample change for #81
Merge branch 'design' of github.com:fairnopoly/fairnopoly into design

Conflicts:
	app/views/shared/_search_form.html.haml