commited
Merge branch 'function'

Conflicts:
	README.md