Merge branch 'release/1.0.1' into develop
Updated formatting
Merge branch 'release/1.0.2' into develop
Fixed merge conflict
Fixed so that gulp watches new files
Bumped version number
Merge branch 'release/1.0.3'
Merge branch 'master' of https://github.com/Frojd/Frojd-Gulp