SmellyFish

# Make sure local master is up to date
$ git checkout master
$ git fetch origin
$ git merge origin/master
# Fix conflicts, commit and push
# Make sure local development is up to date
$ git checkout development
$ git merge origin/development
# Fix conflicts, commit and push
# Merge master into development

SmellyFish

<script>
  (function() {
    var cx = 'your_cx_code_goes_here';
    var gcse = document.createElement('script');
    gcse.type = 'text/javascript';
    gcse.async = true;
    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
        '//www.google.com/cse/cse.js?cx=' + cx;
    var s = document.getElementsByTagName('script')[0];
    s.parentNode.insertBefore(gcse, s);