popUp fixing
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
added skins and a atlas, starting to look good
Merge branch 'mybranch' into develop