# Conflicts:
#	FirstApp/templates/FirstApp/template.html

Committing the addition of 401 page and full implementation of saving activity, emotion and gaze estimations through a single process.

Db and monitoring

See merge request !6

Committing a sample text file to add the deleted local branch.

See merge request !5

Commiting IT17098960's changes

See merge request !4

Summarization changes

See merge request !3

# Conflicts:
#	FirstApp/views.py

Monitoring student behavior

See merge request !2

Committing the full implementation of saving lecture emotion and gaze estimation frame recordings to the database.

Committing the partial implementation of saving lecture activity frame recognitions in the database.