Add file 12 #7
Merge pull request #8 from markallen4123/dev

Merge dev branch with master