Merge pull request #52 from CapCis/master

12.27.14 21:09
Merge pull request #54 from CapCis/master

12.27.14 21:11
Update #128
Update #128
Merge pull request #55 from CapCis/DRCAPCIS

Drcapcis
Commit gitignore
Initial commit
test
Merge branch 'TLCAPCIS'

Conflicts:
	CAPCIS/DataFolder/data.WakTDef
Merge pull request #57 from CapCis/DRCAPCIS

Drcapcis
Merge pull request #59 from CapCis/master

12.27.14 10:18