Fixed form redirect issue
Merge branch 'master' of https://github.com/CSC322-Grinnell/grantapp

Conflicts:
	app/views/programs/show.html.haml
	app/views/programs/show.html.haml~