test for Travis
adding internal energy fn
roxy for new function
NAMESPACE not ready for roxy
merge resolve
Merge pull request #47 from jread-usgs/dUdt

Add D udt (heat storage)
Changing version to reflect proper semantic versioning
Merge pull request #48 from lawinslow/master

Minor bug fixes
Merge branch 'master' of github.com:GLEON/rLakeAnalyzer
Merge remote-tracking branch 'origin/dUdt'

Conflicts:
	DESCRIPTION