Some important commits - #96

Open

nicoasp wants to merge 8 commits into

vikingeducation:masterfrom

Commits on Mar 9, 2017

Add what Nicolas told me to add
AxemGreen
committed
464a053
Explain how to add the '´'
nicoasp
committed
6ca1635
Add merge conflict to pair document
AxemGreen
committed
53122e5
change line 116
nicoasp
committed
8cf156c
Solved merge error with Nicolas
AxemGreen
committed
7111226
Add new merge error
AxemGreen
committed
bc3f71a
new merge conflict
nicoasp
committed
19d6e99
merge solved but research pending
nicoasp
committed
bf67117