something bad
Merge branch 'master' of http://github.com/stonekyx/linearity

Conflicts:
	test.c