Everything
Initial commit from local git
Merge remote-tracking branch 'origin/master'

Conflicts:
	jzip/jzip/main.cpp
Fixed copy