remainder function added
double function added
double function added
conflict branch
master branch
Merge branch 'conflict'

Conflicts:
	maths.c
another message added