gulp
Merge branch 'master' into dev
added icons
updated styling
add icon functionality
gulp