rm'd cep18 dir
Added draft of CEP3
fixed merge conflict