abramov
Merge branch 'master' of https://github.com/Romchela/projects

Conflicts:
	presentations/abramov