add file2 from feature
added text to file1 from feature
added file4 from feature
Merge pull request #1 from taipan148/feature

merging feature onto develop