commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	MemoryGame/TeamWorkDroopy.v12.suo
Delete old project