Schema save
Merge branch 'master' into alyssa

Conflicts:
	db/schema.rb
New migration
Removed foreign keys from attr_accessible
Added column to moments
Added method to calculate input for accum_value in moment
Added methods to determine when goal is met and set completed boolean value to true when goal is met
Merge branch 'master' into alyssa

Conflicts:
	app/controllers/goals_controller.rb
	app/controllers/moments_controller.rb
	app/models/goal.rb
	app/models/moment.rb
	app/views/moments/new.html.erb
	db/schema.rb
Removed binding.pry(s) to appease Ryan