some changes to make it run on my pc
Merge branch 'master' of https://github.com/thiagoleon/barbershop_prototype