Merge branch 'dev'. closes #4
Merge branch 'master' of github.com:rdinnager/greenpipeR