Template added..
Conflict
fixing .gitignore