pedantic version
Merge branch 'master' of https://github.com/yigalalexander/ex14.git

Conflicts:
	src/rline.c