First fix
Merge branch 'master' of github.com:tronje/hlr

Conflicts:
	07-circle/circle.c