Merged remote repository changes by hand.Added .gitignore file to ignore
/bin....doesn't seem to work though