Removed the default "none" argument on energyType of the linexModel function.
Merge branch 'master' of github.com:MatthewHeun/Econ-Growth-R-Analysis
Merge branch 'master' of github.com:MatthewHeun/Econ-Growth-R-Analysis
Deleted package/NAMESPACE from repository and added it to .gitignore.
Merge branch 'master' of github.com:MatthewHeun/Econ-Growth-R-Analysis

Conflicts:
	package/NAMESPACE
Added EconModels.Rcheck/ to .gitignore
Added EconModels_*.tar.gz to .gitignore. Is automatially regenerated each time we build the project.