uploads happen
Merge branch 'master' of github.com:luggage66/thermite

Conflicts:
	package.json