asd
Merge branch 'master' of https://github.com/Francisco89/tesis

Conflicts:
	WorkspaceQt/Streamer/Streamer/Streamer.pro.user
Agrego las cosas que borre