Added zlib linking in makefile
Added map and whatnot
removed that fucking .DS_Store file
bug fix
Merge branch 'master' into nctvyc_sprint3

* master:
  Removed resources from top level.
  erics super duper mergorama
added lib needed to build sfmlMap from tmxt file
merged eric
Merge branch 'nctvyc_sprint3'

* nctvyc_sprint3:
  removed that fucking .DS_Store file
  Added map and whatnot
  Added zlib linking in makefile