removed redundancy
Merge branch 'master' of github.com:sandwich-share/sandwich

* 'master' of github.com:sandwich-share/sandwich:
  re-fixed the merge