git merge ours/theirs doesn't work for some reason
git merge ours/theirs doesn't work for some reason

seattlebrighton/openaps-js,jasoncalabrese/openaps-js,cjo20/openaps-js,timomer/openaps-js,audiefile/openaps-js,PieterGit/oref0,openaps/openaps-js,oskarpearson/openaps-js,PieterGit/oref0,seattlebrighton/openaps-js,esteward/openaps-js,esteward/openaps-js,openaps/oref0,jasoncalabrese/openaps-js,openaps/oref0,cjo20/openaps-js,openaps/oref0,timomer/openaps-js,openaps/openaps-js,openaps/oref0,tghoward/openaps-js,oskarpearson/openaps-js,audiefile/openaps-js,PieterGit/oref0,PieterGit/oref0,tghoward/openaps-js,scottleibrand/openaps-sh