adding stuff
Merge branch 'master' of https://github.com/mrmilosz/atomicity

Conflicts:
	edit.html