i think this works
Merge branch 'master' of github.com:shivakilaru/sodapop