l
Merge branch 'dev' of github.com:/Yoggiburken/Good-bye into dev
added a map class