check style
Merge branch 'develop' of https://github.com/if-050java/ATM_Locator into develop
comment deleting fixed
Merge branch 'develop' of https://github.com/if-050java/ATM_Locator into develop
non default marker
nickname validation, refaktor user position
conflict
Merge branch 'custom_user_marker' into develop
style
Merge pull request #112 from DrBAXA/develop

Develop