initial combination of files
Merge pull request #2 from panaviatornado/master

initial combination