opentechinstitute/TidePools — pull request #13 by g33kgrrl (2013-03-07 10:38:18+00:00)
Title: Fix merge conflict, partial search engine integration

Fix merge conflict in index.html, which occurred between SASS and Search Integration changes. Commit partial integration of search functionality.