Merge branch 'master' of https://github.com/man1utdfan/wander into Joris
Merge remote-tracking branch 'origin/GUI' into Joris
Merge remote-tracking branch 'origin/GUI'
Merge remote-tracking branch 'origin/GUI'
Merge remote-tracking branch 'origin/Joris'
Added mediaplayer, still work in progress
tried something with data
Merge remote-tracking branch 'origin/GUI' into Controller
Resolved merge conflict
Merge branch 'GUI'
fixed stiff
Started Resource file, added media player
Merge branch 'master' of https://github.com/man1utdfan/wander into Joris
OOPS FOUTJE
Merge branch 'GUI' of https://github.com/man1utdfan/wander into Joris
fixed dead links
Language fixed
did some language stuff
languages and shit