Format questions
Merge branch 'redesign' of https://github.com/alexyang21/learnrails
Commit changes
Merge conflict in db:schema
Format video show
Merge branch 'redesign' of https://github.com/alexyang21/learnrails
Merge pull request #53 from susieye19/master

Merge changes