Update Final boss // opponentflow
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game

Conflicts:
	Model.cpp
	Model.h
	main.cpp