Merge pull request #40 from LasseSviland/master

updated script for finding duplicaes
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
Fixed merge conflicts