Made change that will be merged to new_branch
Resolved conflict

Merge branch 'develop' into new_branch

Conflicts:
	main.c