Merge pull request #6 from toannguyenle/natalia

Bootstrap Added
fix merge conflicts
Merge pull request #7 from toannguyenle/toan

fix merge conflicts
modified schema