one unsaved change from before, and new branch for converting to generic views
finished tutorial part 4
trying merge...
ignoring venv folder