changed ignore
Merge branch 'master' of https://github.com/tinza123/where-u-at
mergr 1