Add git ignore files
Merge branch 'production'