demoing branching and merging
master - demo merge/change
devel - demo merge/change
Merge branch 'devel'

Conflicts:
	README.rdoc

 manually merged conflicts
removed changes
Merge pull request #1 from lukemesiti/devel

demoing branches/merging