refact...
Merge branch 'master' of github.com:ElenaBB/ptp_projekt