changed .gitignore file
removed bin and obj files and accepted master changes
Merge