added bin and src
added gitignore file
all merged
merge conflict?