Removed grant1
Add padawan
reset
Merge branch 'padawan'

Conflicts:
	xlfuncs.py