completed steps through 2.1: installed devise gem, ran generators, created devise user
completed s2.1.2: add devise to controllers
completed 2.2.1: added task/user relationship
completed s2.2.2: update controllers, index/update methods now use logged in user
s2.3.1: installed respec
finished s2.0, added task/user specs
Merge branch 'master' of github.com:railsmn/open_camp into s2.0

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #2 from railsmn/s2.0

merging in session 2 changes