second function added
Merge branch 'master' of https://github.com/zinnen/HSRM

Conflicts:
	examples/firstExample.txt