Merge branch 'master' of github.com:chadmoone/patch-test into usability-fix

Conflicts:
	app/views/things/index.html.erb