Updated Basic routing chapter
Conflict in Basic Route
Merge branch 'alaminopu-master'