Adjusting order, not sure if this actually makes a difference but it makes more sense to look at at least.
Merge branch 'master' of github.com:jamesrwhite/beeroclock

# By benhodgson87
# Via benhodgson87
* 'master' of github.com:jamesrwhite/beeroclock:
  Margin tweak to responsive code on countdown timer

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.