Edited main file
Merge branch 'development'

Conflicts:
	hello.c