before touching frontend
Merge branch 'frontend' of github.com:jeantroiani/get_a_room into frontend
my proprieties styled
merge conflict fix