Development

Fixed some merge conflicts

Should be up to date now