update from live version
Merge pull request #13 from schoolofma/content_

Merge pull request #12 from schoolofma/master
Merge branch 'master' of github.com:schoolofma/schoolofma.github.io
Merge branch 'content_'
Merge branch 'content_'
Merge branch 'content_'
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
Update index.html

word fixes
pulling changes
Update default.html

spelling
Update index.html

word delete
Update index.html

added word
Update index.html

word change
edit home icon; edit link color & line-height