Merge branch 'master' of github.com:junpooooow/dotfiles

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/backups/!drive_c!home!.recentf~
nazo
Merge branch 'master' of github.com:junpooooow/dotfiles

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/backups/!drive_c!Users!JUNJOHN!Dropbox!莨夊ｭｰ繝ｻ蟄ｦ莨?!RecSys2014!SIGCHI2013LaTeX!osawa.tex~
	.emacs.d/backups/!drive_c!home!.emacs.d!init.el~
	.emacs.d/backups/!drive_c!home!.recentf~
.gitignore is now working