Trying to pull latest version
test prob
Scoped status updates to the current user on create and update.
Merge branch 'master' of https://github.com/dwittaker/treebook

Conflicts:
	app/views/statuses/_form.html.erb
"Committing a Merge"
	app/views/statuses/index.html.erb
Added bin (binstub) to gitignore
Added users and user friendships with associated tests