changes to user css
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #176 from JessicaTatham/master

Made it so that global search doesn't require location
fix favorite bug
Merge pull request #177 from DineshRai/favorite_button_fix

fix favorite bug
changed css on 3rd page
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #178 from jasonMatney/jason

change 3rd page css
fixed merge conflicts on favorites javascript