stage project
Merge branch 'master' of https://github.com/adamthede/nss-barter-town into temp

Conflicts:
	package.json
	test/fixtures/testfile-copy1.jpg