edit
Merge branch 'master' of http://github.com/CristofferJakobsson/lots

Conflicts:
	test.c