ja
Merge pull request #28 from IRelaxxx/Gustav-Dev

Gustav dev
Updated GUI
Merge branch 'Alex-Dev' into Gustav-Dev
Merge branch 'Gustav-Dev' of https://github.com/IRelaxxx/2DPlatformer into Gustav-Dev

Conflicts: