fix merge conflicts between fatsecret and master
delete duplicate root_path
Add bootstrap and template for dashboard
Add initial styling to dashboard index
merged in design
fix conflicts from merge with origin
Merge branch 'master' of github.com:Egogre/project-x into fatsecret
add goals table, controller and model, and initial view for goal form
Add form to fill out goals
Add display for current goal
Merge pull request #5 from Egogre/goals

Goals
fix merge conflict
fix merge conflicts
delete cassettes to pass tests
merge master with fatsecret branch
fix merge conflicts