merged w/web
Merge branch 'web-interface' of https://github.com/JITSystems/ijkh
merged w/web
DS_Store remove