fixed some stuff after merging
Merge branch 'master' of https://github.com/lishar/addlibs

Conflicts:
	views/newstory.html
fixed a major error with adding stories