added new folder
a1
Adde new file
linux
windows
Merge branch 'develop' of github.com:geopcgeo/options into develop

Conflicts:
	newdevelop/a2
resolved
cleared conflit
Merge branch 'develop' of github.com:geopcgeo/options into develop

Conflicts:
	newdevelop/a2
modified
1