aaa
Completed facebook commend
Merge branch 'facebook_commend'

Conflicts:
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	app/views/videos/show.html.erb