modify ** in develop branch
add $$ to develop branch
add ## to develop branch
Merge branch 'develop'

Conflicts:
	main.c