Answer question 5a
Merge branch 'master' of https://github.com/mathsteck/Algorithms

Conflicts:
	Trabalho 2/arquivos/Main
	Trabalho 2/arquivos/cliente.dat
	Trabalho 2/arquivos/includes/VideoStore.h