Solved conflict in .gitignore
Updated year in demo's