fixing merge issues
merge

Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	utils/R/convert.input.R