working on setup
Merge branch 'master' into develop
working on programming setup, gulp seems to work much better that grunt, will use that in the future.
before deploy to thingsarerandom