cool archive id
Merge branch 'master' of https://github.com/lishar/addlibs
Merge branch 'master' of https://github.com/lishar/addlibs

Conflicts:
	views/archive.html
databases....yeahhhhh
Merge branch 'master' of https://github.com/lishar/addlibs