Merge pull request #2 from if-050java/master

entity add
Merge pull request #14 from jimmy-sv/master

Merge pull request #2 from if-050java/master
Merge branch 'develop' of https://github.com/jimmy-sv/ATM_Locator into develop
add sign up
merge with conflicts