Beginning development of string formatting feature
Merge branch 'develop' into feature
Merge pull request #1 from kylehughes/feature

Merge develop updates into feature