Team2 Project Configured

Configured workspace for member name1
Simulation Configured
Implemented button1
Merge branches 't1' and 't2'

Conflicts:
	DefinitionFile/DefinitionFile.sgfx