Pair programming 2 onwards

Added version from joint programming session working on exercises 2 onward (catalog and buffer pool)