final changes and will be submitted to myCourse
Merge branch 'master' of https://github.com/MagicKagari/COMP361_Medieval_Warfare

Conflicts:
	v1.0/UI_sketch/to_submit/battlefield.txt