Merge pull request #12 from schoolofma/master

pull
Merge pull request #13 from schoolofma/content_

Merge pull request #12 from schoolofma/master
Update default.html

!
small fixes
solving conflict
Merge branch 'master' of github.com:schoolofma/schoolofma.github.io
solve conflict
Merge branch 'content_'
fix link to Abe's website
Merge branch 'content_'
fix link to Abe's website again
Merge branch 'content_'
Update index.html

update
Merge pull request #15 from schoolofma/content_

Update faq
Update index.html

added ""
Update index.html

edited text
Update index.html

link, text edit
Update index.html

added yay!
Update index.html

added link:)
Update index.html

word change