creation branche contenu suppr <a>
Merge remote-tracking branch 'origin' into contenu

Conflicts:
	app/index.html
ajout contenu et slides
Working on fancybox :
	Fancy box loaded
	adding thumbnails
Fancybox is configured for slide photography
Merge branch 'master' of github.com:Neko-cat/Neko-Portfolio into contenu
Ajout de mon contenu
License
preparation merge
Merge remote-tracking branch 'github/fancybox' into contenu

Conflicts:
	app/styles/main.scss
Add "parallax" effect on the background slide1
Remplissage contenu
Merge branch 'contenu' of github.com:Neko-cat/Neko-Portfolio into contenu
Portfolio compatible with weird resolution. Fixing resize bug. cleaning
nasty stuff in js.
Font
Merge branch 'contenu' of github.com:Neko-cat/Neko-Portfolio into contenu
Beta version 1.0
Merge branch 'contenu' of github.com:Neko-cat/Neko-Portfolio