Some Minor Changes

Change list:
Attribute: added an addition operator
Menu: Fixed some input reading for create_team
Token_Generator: made initial current_champion to "none" instead of
blank, changed order of player to have team before number in the header
Merge branch 'TIm' into Yash_Side

Conflicts:
	Menu.cpp
	Menu.h