update
Merge branch 'master' of github.com:uncharted/promise-tracker

Conflicts:
	js/promise-tracker.js