erics super duper mergorama
Added zlib linking in makefile
Added map and whatnot
removed that fucking .DS_Store file
Merge pull request #87 from Codes-With-Eagles-SWE2014/ecgprc_sprint3

updated troop class files, implemented mechanisms for states to handle n...
Removed resources from top level.
Merge branch 'master' into nctvyc_sprint3

* master:
  Removed resources from top level.
  erics super duper mergorama
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
redid the entire map, modified the flag handler to accomdate new build; updated sfmlMapLoader