a
Merge branch 'master' of https://github.com/lishar/addlibs

Conflicts:
	views/css/style.css
	views/newstory.html