different shot modes depending on focus state
Merge branch 'master' of https://github.com/rickyyu2294/Bearpocalypse

Conflicts:
	inputMgr.py