yes
blah!
Merge branch 'master' of https://github.com/AlexKund/newProject

Conflicts:
	data/journal/j._0
	data/journal/lsn