fixed conflict
-rw-r--r-- 31 .gitignore
-rw-r--r-- 559 README.md
-rwxr-xr-x 1269 example1.py
-rwxr-xr-x 3750 example2+3.py
-rw-r--r-- 3092 example2.glade
-rwxr-xr-x 2234 example2.py
-rw-r--r-- 4603 example2_2.glade
-rw-r--r-- 5506 example3.glade
-rwxr-xr-x 3471 example3.py