Working on image gallery and user design for third page
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #41 from JessicaTatham/master

Working on image gallery and user design for third page
Added animations to first page
Fixed merge conflicts
Merge pull request #42 from LasseSviland/master

Added animations to first page
Fixed broken feature test for description page
Fixed broken feature test for description page
Merge pull request #43 from LasseSviland/master

LasseSviland	Fixed broken feature test for description page
fixed seed file
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #44 from LasseSviland/master

fixed seed file
Changed CSS of third page
Merge pull request #45 from JessicaTatham/master

Changed CSS of third page
Updated method to find cities based on location
Merge pull request #46 from LasseSviland/master

Updated method to find cities based on location
fixed merge conflicts