Install devise,add a user
Merge branch 'master' of https://github.com/keithgordon/treebook

Conflicts:
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb