remove comma
testing merging and branching from master
testing merging and branching from devel
Merge branch 'devel'

Conflicts:
	app/views/pages/welcome.html.erb