Revert "Revert "Merge branch 'master' of https://github.com/CodeAngels/codeangels.github.io into js_basics""

This reverts commit 89485d782398acad24983629c6c1231ffb1a83a2.
Merge pull request #7 from CodeAngels/fix_bad_merge

Revert revert via revert and get this revert reverted
Merge branch 'master' of github.com:CodeAngels/codeangels.github.io into jQuery

* 'master' of github.com:CodeAngels/codeangels.github.io:
  Revert "Revert "Merge branch 'master' of https://github.com/CodeAngels/codeangels.github.io into js_basics""