tiles header
Merge remote-tracking branch 'origin/master' into adrian
added some background changes. add more variables to player
Merge remote-tracking branch 'origin/master' into adrian
tiny amount of work done
Merge remote-tracking branch 'origin/adrian'

Conflicts:
	FinalProject/FinalProject/FinalProject.vcxproj.filters
	FinalProject/src/Manager/LevelManager.h