addded name
Merge https://github.com/IllinoisRoboticsInSpace/administrative

Conflicts:
	Add your name here.txt
Merge branch 'master' of https://github.com/IllinoisRoboticsInSpace/administrative

Conflicts:
	Add your name here.txt
Merge branch 'master' of https://github.com/IllinoisRoboticsInSpace/administrative

Conflicts:
	Add your name here.txt
Merge branch 'master' of https://github.com/IllinoisRoboticsInSpace/administrative

Conflicts:
	Add your name here.txt
Merge branch 'master' of https://github.com/IllinoisRoboticsInSpace/administrative

Conflicts:
	Add your name here.txt