better seperation of code, and merge function added for lib
readme
Merge branch 'master' of https://github.com/rgrannell1/codeR

Conflicts:
	README.md