Merge branch 'master' of https://github.com/ronnyvv/Watch.JS into ronnyvv-master

Conflicts:
	src/watch.js