ajout des network de nanak
Merge branch 'master' of github.com:code-troopers/jekyll-website
template header, footer
(cherry picked from commit c928009)
style project
Merge branch 'master' of https://github.com/code-troopers/jekyll-website

* 'master' of https://github.com/code-troopers/jekyll-website:
  ajout des network de nanak
"Nos derniers projets"
file for kimsufi jenkins forge
fix README
update jenkins job
update phone number + jenkins job
Create CNAME
Merge branch 'master' of https://github.com/code-troopers/jekyll-website

* 'master' of https://github.com/code-troopers/jekyll-website:
  Create CNAME
move CNAME and copy with grunt to the build folder
add matchdep dep to package.json
new js logo
udpate e-service website
google analytics + delete bugherd script
add gitignore to app directory
Merge branch 'master' into blog

* master:
  add gitignore to app directory
  google analytics + delete bugherd script
  udpate e-service website
  new js logo
  add matchdep dep to package.json
  move CNAME and copy with grunt to the build folder
  Create CNAME
  update phone number + jenkins job
  update jenkins job
  fix README
  file for kimsufi jenkins forge
  "Nos derniers projets"
  style project
  template header, footer (cherry picked from commit c928009)
  ajout des network de nanak

Conflicts:
	app/_includes/footer.html
	app/_includes/header.html