add wine
Merge remote-tracking branch 'origin/master'
cake truth
cake lie
Youhou! Merge branch 'master' of https://github.com/npirard/git-real

Conflicts:
	readme.txt
add comment in wine
modif in readme
hahaha
hihihi
hohoho
Add unicorns
Add rainbows
Add index
Fix pluralization
Merge branch 'master' of https://github.com/npirard/git-real into unicorns
Add in index
Add in index
Add index
Fix pluralization
Add in index-secondmsg