Added one line for a
deleted line
It's back now.
From test
Merge branch 'test'

Conflicts:
	stuff.c