Changed window size
Changed window again
Changed window size again again
Merged the window size changes
spacing
Merge branch 'master' of https://github.com/AstroTeam/Game
merging files from shared repository
Merge remote-tracking branch 'origin/master'
Added Tile Info Screen
Changed the first message that displays in the console when the game first begins
updating my master with local repo
updating the main.cpp file which had a merge conflict
Merging with master to update with SDL and other changes