Merged changes from TileEngine folder into assignment 5 folder