Merge pull request #1 from lesPATenteux/master

update branch
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
todo
added easter egg

booty
updated
Merge remote-tracking branch 'origin/gh-pages'
asdfasdf