implemented timestepping
solved mergeconflict
adjusted ArmsComponent projectile speed