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