asd
Merge branch 'master' of https://github.com/Aeron1312533/Temp

Conflicts:
	Strateg/public/test