Inicio do GPlus
Merge branch 'master' of https://github.com/izzui/learning-channel

Conflicts:
	LearningChannel/app/views/video.html
GPlus
Merge branch 'master' of https://github.com/izzui/learning-channel.git
Deixando o GPlus de fora, por enquanto