Merge finished rifle

Production ready rifle needs to be merged into my work branch for further weapon development.