other side of conflict, because a conflict needs at least two sides
Merge branch 'master' of
ssh://git@github.com/lorenzo-pagliari/RTBM_Project.git

Conflicts:
	Real-Time_Bridge_Monitoring/src/testLayer/ClassTest.java