Merging dropbox files with git files
test
Merge branch 'master' of ssh://github.com/ringstadd/gaussianwellrey