Add func2
haha
oh~ no
Merge branch 'fix1 merged'

Conflicts:
	func1.c