Click to match
in-memory match for now, need to learn sqlalchemy
Simple green box for selection
Add flask-restful as pip dependency
Merge branch 'master' into kdodia/image_match

Conflicts:
	app/db_api.py
	app/views.py
Added model multiple file and folder upload.
Updated sidebar with images and data models.
Step merge commit.
More merge fixes.
Merge branch 'master' into data_model

Conflicts:
	app/db_api.py
	app/views.py
fix ache crawler
Merge pull request #51 from brittainhard/data_model

Data model changes
Merge pull request #37 from ContinuumIO/kdodia/image_match

[WIP] Kdodia/image match
Revert "[WIP] Kdodia/image match"
Merge pull request #52 from ContinuumIO/revert-37-kdodia/image_match

Revert "[WIP] Kdodia/image match"
Revert "Data model changes"
Merge pull request #53 from ContinuumIO/revert-51-data_model

Revert "Data model changes"
add resources path folder to share app data in zip
Merge branch 'master' of github.com:ContinuumIO/memex-explorer