Users can edit their information
Changed story field to text area
Merge branch 'master' of https://github.com/jchansen/cft2013

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