Merge pull request #2 from trailheadlabs/development

Development
timing
optimization
caching
code cleanup
fix styles
add comment
Merge pull request #58 from etown/search

Search