tests go crazy
fixed a merge conflict
Pushar margin
Merge branch 'master' of github.com:TeamPostits/floggit_postits