editing the goals controller
changes to goal controller
Merge branch 'master' into goalnew

Conflicts:
	Moolah-Meerkat/app/models/user.rb
	Moolah-Meerkat/db/schema.rb
conflicts