added server
Merge branch 'master' of https://github.com/macmania/iva.com