Merge branch 'wip'
Merge branch 'wip'

Conflicts:
	gulpfile.js
Merge branch 'wip'
Merge branch 'wip'
Deleted Github docs
Update README.md
Merge branch 'master' into wip