commiting to get lates version
solved an easy  merge conflict
nothing to commit
Merge branch 'master' of github.com:TeamPostits/floggit_postits