almost got desktop working
need to have for eclipse to import
working with pictures
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into desktop
Finally made the desktop version work. It's bit of an ugly solution but we arefocusing on android so it doesn't matter.
If more images are to be added then they need to be added manually in BOTH projects
Merge branch 'desktop' into develop