applied shock rifle rebalance from earlier betas
Merge branch 'master' of https://github.com/slatenails/omega

Conflicts:
	changelog.txt
Merge branch 'master' of https://github.com/slatenails/omega