finalizing working
fixing merge issues
Merge branch 'master' of https://github.com/Caveat4U/is_it_feasible

Conflicts:
	app/views/proposals/_form.html.erb
fixing current cucumber tests