Added the .gitignore file, this should ignore the bin/ directory
Merge remote-tracking branch 'origin/master'