bug fix
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
fixed the makefile
wip
redid the entire map, modified the flag handler to accomdate new build; updated sfmlMapLoader
added framerate to game loop to stop my CPU from crying
pulled in updated map
wip
push for joe