Removed merge conflict in _snap.scss.
Merge pull request #73 from ua-snap/community_charts

Removed merge conflict in _snap.scss.