Created Rails application and added status updates
-m "Added Bootstrap to file"
Merge branch 'master' of https://github.com/brianhuymac/treebook

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/statuses.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/statuses.css.scss
	app/views/layouts/application.html.erb
	app/views/statuses/index.html.erb
	config/application.rb
	config/environments/development.rb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb