specifically told git to add index.ejs
Merge branch 'develop' into staging