joined modules
ive done nothing
Merge pull request #15 from Mathdrquinn/master

joined modules from 2 to 1