Hossam did not pull before committing
Hossam merged with Jamal

Conflicts:
	main.cpp