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

Conflicts:
	angel-js/task.js
yo
updated that user, #fuckTriana
testtho
commit tho
commited
Merge branch 'master' into vashes-stuff

Conflicts:
	angel-js/task.js