Version 0.13
Merge branch 'master' of github.com:newphew92/School

Conflicts:
	newuser.c