Merge branch 'master' of https://github.com/rich-iannone/PuffR

Conflicts:
	PuffR.R
Cleaned up some lines.

Merge branch 'master' of https://github.com/rich-iannone/PuffR

Conflicts:
	PuffR.R