changed to folder
add
Merge branch 'master' of https://github.com/nharris172/sensorweb

Conflicts:
	nclsensorweb/classes.pyc
	nclsensorweb/tools.pyc