added gitignore
fixing merge conflict
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame

Conflicts:
	UDK-2013-02/Development/Src/Stockholm/Classes/CaptorController.uc
merging and stuff
hostage bumping
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame