Merge pull request #2 from sjacob95/master

Luciano Pull Request 1
Merge branch 'Luciano' of https://github.com/sjacob95/TileTraveler into Luciano