test1
Update README.md
tes
Merge branch 'master' into test

Conflicts:
	Assets/Scripts/Reference.cs
Merge branch 'master' of https://github.com/mkchu243/magnaCarta
Update README.md
Merge branch 'master' into mwoo_dev

Conflicts:
	Assets/Scripts/Reference.cs
Merging master into mwoo_dev