Fixed some things with archives and removed the spaces betwen entries
Fixed merge conflict
Merge branch 'master' of https://github.com/lishar/addlibs