Temp Commit
Finally got fucking ejs to work
updated docs/featureLog.txt
Merge of origin/develop into develop