Updated Functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ExampleFiles/proposedAlgorithm.m