Creating template
deleted the whole thing
Merge branch 'master' of ssh://mustard-ottosipe.rhcloud.com/~/git/mustard
Merge branch 'master' of github.com:themattman/mustard
larger height
Merge branch 'master' of github.com:themattman/mustard