Updates 'learning_log.txt'
Fixes merge conflict
Merge branch 'master' of github.com:qsymmachus/notes
Adds /design_patterns