Doing a test
Change the function name
Merge branch 'master' into testing

Conflicts:
	serve.py
Merge pull request #1 from viedu/testing

Doing a test