Updated git ignore and removed binary files from repository
Merged git ignore conflicts