in the process of reworking
fix map not displaying
adding search by text or filter
Merge branch 'dan-working' of https://github.com/AmericanRedCross/Mapfolio into dan-working

Conflicts:
	js/main.js
Merge pull request #4 from AmericanRedCross/dan-working

fixing and updating things