Roynew
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from roydude2/master

Changed test7