office 11/6
Merge branch 'master' of https://github.com/jijoel/web-development-notes
office 11/11
merge changes