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

Conflicts:
	Client/Quotr/Base.lproj/Main.storyboard
	Client/Quotr/QuotrTableViewController.m