whoops, deleted one line too much
Merge branch 'master' of git@github.com:Dexels/navajo.git