did something
Merge branch 'master' of https://github.com/iakhan/quotr

Conflicts:
	Client/Quotr/NewQuotebookViewController.m
Merge branch 'master' of https://github.com/iakhan/quotr