From e7c555cd6aa05cc96ac896998137ef3164b35164 Mon Sep 17 00:00:00 2001
From: s45162 <ms15159@st.amu.edu.pl>
Date: Sun, 3 Dec 2017 15:35:32 +0100
Subject: [PATCH] Merge branch 'master' of
 https://git.wmi.amu.edu.pl/tdwojak/Python2017

# Conflicts:
#	labs02/test_task.py
---
 labs04/task02.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/labs04/task02.py b/labs04/task02.py
index 88741a4..274ded4 100644
--- a/labs04/task02.py
+++ b/labs04/task02.py
@@ -1,3 +1,23 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 
+class Employee:
+    id=1
+
+    def __init__(self, imie, nazwisko):
+        self.imie= imie
+        self.nazwisko=nazwisko
+
+    def get_id(self):
+        return self.id
+
+Prac=Employee('Anna', 'Nowak')
+print(Prac)
+"""
+class Prostokat(Figura):
+    def __init__(self, vertexes):
+        super().__init__(vertexes)
+
+    def czy_jestem_kwadratem(self):
+        pass
+"""
\ No newline at end of file