hannahs stuff
Merge branch 'master' of https://github.com/ninjaofawesome/gentle_reminder

Conflicts:
	gentle_reminder/app/controllers/goals_controller.rb
added validations, changed some database columns