rename welcome folder
Merge branch 'master' of https://github.com/jayzz55/superlist

Conflicts:
	app/views/welcome/about.html.erb
	app/views/welcome/index.html.erb