Merge pull request #4 from simbiotica/features/styles

Features/styles
Merge pull request #3 from simbiotica/features/grunt

LGTM! :dancer:
Merge branch 'dev' into features/grunt