added a new function
fixed conflict

Conflicts:
	README.md