changed some stuff around in expedition page, added animation to filter options
testing...
worked on exp page
Merge pull request #6 from maaviles/macycss

Macycss
resolve merge conflict
resolve merge conflict
Merge pull request #7 from maaviles/css-base

style of navbar and homepage
merge conflict error