deleated html wrong file
fixed conflict
Merge branch 'master' of https://github.com/meet-projects/expose-y3-2014