added a timed bullet reset to prevent the bullets from running out
Merge branch 'master' of https://github.com/dadleyy/Project-NN

Conflicts:
	Project-NN/entity/PlayerControls.cpp