Fix typo
Fix broken link to the first page of Controller section
Ruby Symbol
conflict fix
Merge branch 'sikajs-master'
Merge branch 'master' of github.com:rocodev/rails-102