update with dev branch

so that there's a non-master branch to pull to