Merge pull request #1 from micapat/MicaBranch

2commmit
3rd commit
Merge branch 'master' into MicaBranch

Conflicts:
	test.c