Merge branch 'master' of https://github.com/cicadas-2014/Embark
Working on favorites button
fixed merge conflicts on favorites javascript
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Fixed my unfiltered experience button so it works now
Merge pull request #186 from JessicaTatham/master

Fixed my unfiltered experience button so it works now