camera collision rect is now based upon the player collision rect
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant

Conflicts:
	src/player.py
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant
fixed camera detection and fixed camera rotation when the rotation arc crosses the 359-0 transition. maybe.