Added remainder function
Added trivial change
Merge branch 'testing'

Conflicts:
	maths.c