Camera Tracking!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/player_component.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/player_component.cpp