Fix git conflictf + adding Faculty, Sections and programs tables/classes