test master branch
add gitignore
test
test
test
test
Merge branch 'testSimu'

Conflicts:
	main/main.c