Added save icon and css
Updates for last merge
Fixed merge conflicts
Merge pull request #98 from jchristo4/master

Added save icon and css