videoApp error
Merge pull request #38 from Zacsi/user-model

videoApp error
Merge branch 'master' into eed

Conflicts:
	videos/app/videosApp.js