Update gitignore
Refactor code to use context processor
Merge remote-tracking branch 'origin/master'