css
Merge branch 'develop' of github.com:JayK31/cycle-smart into css_eight
css
added groupon model and controller with #index
added groupon route to #index
css changes
some sick js
sick css changes
sick css n js
css changes
css
css changes
added groupon to map
fix merge conflicts in map and user show
fix merge conflicts