Merge pull request #14 from opentechinstitute/lisa_search

Lisa search
integrating Nick's changes w/r to assets directory
add nick to contributors
Merge branch 'master' of https://github.com/opentechinstitute/TidePools into lisa_search
merge with upstream changes