bashrc: maki 추가
Merge branch 'master' of github.com:ygpark/.my

Conflicts:
	config/_mybashrc