changed the tiles dramatically
added files to commit
resolved merge conflicts