ip in separate field
Merge branch 'master' of https://github.com/dsgruss/herokuapp