Renamed screenLocation to worldLocation to prepare for the eventual larger map size.
Synced through github app

gitignore updated? so yeah
Insignificant commit

Stupid conflict with gitignore
Merge origin/master into mike
Merge pull request #14 from mfrancis95/mike

Minor changes
Merge pull request #15 from mfrancis95/master

Pulled from master