test commit
small article list changes
visual changes
visaul changes
Merge branch 'markup'

Conflicts:
	app/views/users/_form.html.erb
	app/views/users/index.html.erb