removed project && project.bak
add git ignore
merge by deleiting prject.xml 2