this is bad
Merge remote-tracking branch 'origin/master'

Conflicts:
	Manage-Users/manageUsers2.py
Merge branch 'master' of https://github.com/kgerrow/ManageAGOL