Display one function
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Display one function
Display one function