Created a copy rails application
Merge branch 'master' of https://github.com/stvnlrnz/treebook

Conflicts:
	config/initializers/secret_token.rb
	config/routes.rb