Updates
Merge branch 'master' of github.com:andreiparvu/AlgoLab
Some adjustments
Merge branch 'master' of github.com:andreiparvu/AlgoLab

Conflicts:
	aliens/aliens
	aliens/aliens.cpp
Updated solutions week 3