ee
Merge branch 'master' of https://github.com/raspisanie/sbs20120806

Conflicts:
	abc.txt
ddasd