Make branch MacOSX
Merge pull request #2 from sukerutulo/MacOSX

Make branch MacOSX
Add .zshrc and Modify .emacs
Add .zshrc and Modify .emacs
Merge branch 'ubuntu'
Resolve conflict
To organize commit
Merge and resolve conflict
Merge branch 'master' into ubuntu