Updates Gemfile.lock
Merge branch 'master' of https://github.com/evja/Planner
Merge pull request #10 from LindsayH/devise2

added devise
Merge branch 'master' of https://github.com/evja/Planner
early updates.
devising update in progress
Merge pull request #11 from Koma2Koma/devising

Devising
fixed up static pages. bootstrapped the _form. styling
fixed merge conflict
need routes
Mergt
need routes branch 'master' of https://github.com/evja/Planner into devise2
seeds and user_id