upload/remove directories
Merge branch 'master' of https://github.com/pvraj/OneDir

Conflicts:
	UserClass.py