Yesh! New update

Gulp added, new template and styles
modified controller for conflict