Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #171 from jasonMatney/jason

changes
wip
wip
Update README.md
Merge pull request #172 from DineshRai/fix_favorite_button

Fix favorite button
Merge branch 'master' of https://github.com/cicadas-2014/Embark
updated filter button to not go on top of everything else
Merge pull request #173 from LasseSviland/master

updated filter button to not go on top of everything else
made categories sorted
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Fixed small CSS changes on description page and user page
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #174 from LasseSviland/master

	made categories sorted
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #175 from JessicaTatham/master

	Fixed small CSS changes on description page and user page
changes to user css
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Made it so that global search doesn't require location
Redirects user to global if no location is given