added json api
Merge branch 'master' of https://github.com/GSto/fourathensdirectory
added companies to api
merged conflicts