added archive
fixed merge conflict
Merge pull request #7 from mendyismyname/master

fixed merge conflict