checkin button changing when inside bubble
conflit solving
Merge branch 'master' of ssh://git@github.com/TiagoSousa28/SegUA2.0.git
a