Merge pull request #1 from kirbyman62/master

Silly me should have updated then made new branches,
Removed duplicates
Merge pull request #3 from kirbyman62/level-editor

Merge pull request #1 from kirbyman62/master
Revert "Seperated game and level-editor code due to Alex deleting code"

This reverts commit fd6b341c0ada0cc42fc216f3a1b65768f13c6cba.
Revert "Removed duplicates (was supposed to revert this one!)"

This reverts commit 1e0d499b1a4a9701143b1103bc17033dba6909a1.
Revert "Revert "Seperated game and level-editor code due to Alex deleting code""

This reverts commit e64a5074f6d48298cb70d9b3977b3deec763fa77.
Delete tile.h

Was not meant to commit this yet. Don't use the * wildcard, kids.
Removed duplicates hopefully
Merge pull request #4 from kirbyman62/game

Merge pull request #2 from kirbyman62/master