Merge pull request #4 from pennappslabs/name_search

Added name search logic for directory
Merge pull request #5 from pennappslabs/docs

Docs
merged
merged
Merge branch 'master' into docs

Conflicts:
	server/api.py