Merge pull request #17 from dcaff/master

merging 3
Accepted Ernest's new functions/tweaked documentation
Update twodranduphill.R
Merge pull request #12 from JackStat/master

merge