added validations for WeightEntry
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
Added Progress link to navbar
Updated progress page with navbar include
apparently Gemfile.lock is ediited
Merge branch 'master' of https://github.com/kevinzang/fitplan_diet_calculator
Iteration 2
final changes to progress before submission
save
update to controller.progress, fix minor merge conflict
fix bug with signout by disabling link
updated database schemas
added migrations
updated design of progress page.  Added css file
Updated workout plan
merge with master
Can add WorkoutEntries now
Activity level and weekly goal added to UserProfile. Some refactoring and editing of unit tests. Note: haven't implemented automated GUI tests for the change.
Added backend support and unit tests for weight entries
More tests for weight entry