before bens merge
Merge branch 'master' of github.com:greggehrich/sap3-gg

Conflicts:
	app/views/stories/_form.html.erb