basic_function
Merge branch 'Crate_basic_function'

Conflicts:
	main.c