caps now
Merge branch 'upCase'

Conflicts:
	roster.txt