Added git ignore and removed bin/* files that i do not want to track
Fix Merge Conflict
Added gen/* to gitignore and removed those files from the repo