Committing in slave branch
fixed the broken bla bla ..
finished work on slave
Merge branch 'slave'

Conflicts:
	hello.c