Revert "fixed merge conflictsMerge branch 'sha1' of https://github.com/cdcharlebois/swipe-app-meteor into cdcharlebois-sha1"

This reverts commit a5418090e3efd5b2dcb8e25ba01ffa8f0d0c0464, reversing
changes made to feefefa324b1ab46e90fdd954f0d3090680673da.