Added ignored files into .gitignore
All cleaned. Modified TODO.txt
Fixed .gitignore conflict