tes
Merge branch 'master' into test

Conflicts:
	Assets/Scripts/Reference.cs
Merge branch 'master' of https://github.com/mkchu243/magnaCarta