get content from db
gitignore
remove idea
limpar
Merge branch 'getContentFromDB'

ir buscar contents da bd
Merge branch 'master' of https://github.com/CampusPI/Server

Conflicts:
	api/tv/content.js
merge
get videos from db
testes meh
limpar
Merge pull request #7 from CampusPI/getVideosFromDB

Get videos from db
Merge branch 'master' of github.com:CampusPI/Server into mailfeed