merge
fuck git merge

Merge branch 'master' of github.com:chilldude/peer-library-frontend
sexy nav etc.