check
commit
hsgstg
qwerqwer
qwer
Merge branch 'master' of https://github.com/FranciscoAlonso/SOS3

Conflicts:
	project.properties
	src/tesis/sos3/InVideoCall.java