Add Devise and Nav
Merge pull request #4 from codefellows/ron

Add Devise and Nav
Merge remote-tracking branch 'origin/sunny-ron-pete' into pete, conflicts fixed

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	db/schema.rb