Merge pull request #17 from IRelaxxx/Alex-Dev

Alex dev
Merge pull request #18 from IRelaxxx/Alex-Dev

Fixed a bug
random commit
Merge pull request #19 from IRelaxxx/Alex-Dev

Updated Android Settings
Merge remote-tracking branch 'origin/Gustav-Dev' into Gustav-Dev

Conflicts:
	2DPlatformer/2DPlatformer.userprefs
Merge branch 'Gustav-Dev' of https://github.com/IRelaxxx/2DPlatformer into Gustav-Dev
random commit
Merge branch 'Alex-Dev' into Gustav-Dev
Merge branch 'Gustav-Dev' of https://github.com/IRelaxxx/2DPlatformer into Gustav-Dev

Conflicts:
	2DPlatformer/2DPlatformer.userprefs
random commit
Level3Added
Stuff
Merge remote-tracking branch 'origin/Gustav-Dev' into Alex-Dev

Conflicts:
	2DPlatformer/2DPlatformer.userprefs
Delete 2DPlatformer.userprefs
Delete 2DPlatformer.userprefs
Added Level 3
Merge remote-tracking branch 'origin/Alex-Dev' into Alex-Dev

Conflicts:
	2DPlatformer/2DPlatformer.userprefs
Merge branch 'Gustav-Dev' of https://github.com/IRelaxxx/2DPlatformer into Gustav-Dev

Conflicts:
	2DPlatformer/2DPlatformer.userprefs
Level1 bearbeitet
Level3 bearbeitet