Eric merging
eric merging
working versiongit add src
merge