new_design+
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaApplication1/src/javaapplication1/NewJFrame.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit bb5ad275d74947c2e9f69d402aae8d8e328b38f1.
Merge branch 'master' of https://github.com/kukter/Praktyki-GUI