Add file2 from feature
Add text to file1 from feature
Add file4 from feature
Merge pull request #4 from scgarland191/feature

Feature pull into develop.