added new function
adding in comment on conflict branch
adding in comment in master branch
Merge branch 'conflict'

Conflicts:
	maths.c
added a second line on master
added a second line
Merge branch 'conflict'

Conflicts:
	maths.c