Update Repo to match the master

Updating the nordling-dev so it matched the master branch