Merge pull request #51 from susieye19/master

Format Q&A
Merge pull request #52 from susieye19/master

Formate videos and charges
Set up user permissions
Merge branch 'redesign' of github.com:alexyang21/learnrails into redesign
Format questions
Merge branch 'redesign' of https://github.com/alexyang21/learnrails
Rename questions migration
Commit changes
Merge conflict in db:schema
Clean up user permissions and form layout
Format video show
Merge branch 'redesign' of https://github.com/alexyang21/learnrails