reference static
Merge branch 'master' of git://github.com/findley/Combopedia into django2
reorganized assets into static folder for easier integration with django
Merge branch 'master' of github.com:findley/Combopedia
Merge branch 'django2'