update
Merge branch 'master' of https://github.com/alegros/c_the_hard_way

Conflicts:
	Makefile
Update