Merge pull request #1 from Cholera-Infrastructure-Game/dev

Added mac OS X related files to .gitignore
Merge pull request #2 from Cholera-Infrastructure-Game/dev

Commented .gitignore file
barring how incredibly racist this map is, I think it looks pretty cool lol. If anyone finds a better tile set, let me know. Meanwhile, I'm going to shop for less racist buildings (terrain is fine i think)
Added a new (unfinished) map with a  new look, let me know what you think
Merge pull request #4 from Cholera-Infrastructure-Game/dev

Dev
Merge pull request #5 from Cholera-Infrastructure-Game/master

pulling master into dev...kind of odd