changed some names
Merge branch 'master' of https://github.com/milesdev/contact
Moved some files around, changed generation of id
Merge branch 'master' of https://github.com/milesdev/contact