Nick submitted his name
added my name
added name
TEsting Git
Test Adding Userena from internet
Deleted userna
Working build
Working build
Merge https://github.com/UCSD-TIES/ckprosecution

Conflicts:
	mkadmin.py