Commit 64481393 authored Nov 29, 2011 by John Crepezzi

Merge branch 'master' of codeplane.com:seejohnrun/haste-server

Conflicts:
	README.md

There are no changes