initial word count logic
Fix merge conflicts
Merge branch 'template' into development