fix
Merge branch 'master' of github.com:StevenKo/novel_reader_server

Conflicts:
	app/views/articles/edit.html.erb