Clean Up
Merge branch 'master' of https://github.com/calcoder/facebookapp

Conflicts:
	app/controllers/welcome_controller.rb
	app/views/welcome/index.html.erb