adjusting bullets
Merge branch 'master' of https://github.com/willy3615/roidRage

Conflicts:
	public/gameEngine/objects.js
	public/gameScripts/gameplay.js