Add abrac
Change foo
Merge branch 'master' into tmp

Conflicts:
	foo
Merge pull request #2 from tilius/tmp

Add abrac