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

Conflicts:
	Client/.DS_Store
Stuff