removed public
Merge branch 'master' of https://github.com/lishar/addlibs
added a lot of things
Merge branch 'master' of https://github.com/lishar/addlibs

Conflicts:
	public/.DS_Store
	public/images/favicon.ico
	views/css/style.css
	views/index.html
	views/js/user_input.js
	views/newstory.html
Merge branch 'master' of https://github.com/lishar/addlibs