initial
add function with all kinds of arguments
Merge branch 'master' of github.com:zhangchi86/python

Conflicts:
	function_argument/main.py