first commit to add all files to repo
finalizing merge
add foo test
test
test 2