db error
done
Merge branch 'master' of github.com:sonaht/treebook

Conflicts:
	db/schema.rb
first attempt on bootstrap and layout