update init-local on mac
Updated merge conflict for init-local.el
Merge branch 'master' of https://github.com/theophilusx/emacs.d
Added researchData.org agenda file to tx-org.