day 1 [2]
Merge branch 'master' of https://github.com/LesyukSerg/My-Notepad-Settings

Conflicts:
	session.xml
add gitignore