Now that #38 is fixed, update http-basic example
Merge branch 'update-http-basic-demo' of https://github.com/cldwalker/friend-demo

Conflicts:
	project.clj