t push
wq
:wq
- m "new chnges"
wq
:wq

:wq
Merge branch 'master' of https://github.com/LyubomyrB/ProBlesk

Conflicts:
	css/style.css