Minus
Merge branch 'minus'

Conflicts:
	main.c