Merge pull request #1 from ammirsm/master

Merge branches in school
Merge pull request #2 from ammirsm/master

Update index.html
Merge pull request #3 from ammirsm/gh-pages

Update index and change repo