stars fixed
merge from alex
review for user
add video
Merge branch 'development' of https://github.com/jeantroiani/get_a_room into development
before merge
fix merge conflict