make setup
Merge branch 'public' of github.com:LiveTex/Node-Pg into public

Conflicts:
	Makefile