Merge branch 'master' of https://github.com/VashishtMadhavan/pitch-js

Conflicts:
	angel-js/task.js
yo