Merge branch 'master' of https://github.com/MiguelCastillo/spromise

Conflicts:
	src/async.js
	src/promise.js
	tests/specs/promise.js
Resolved conflicts