add lua-mode
Merge branch 'master' of github.com:Airead/airemacs.d
Merge branch 'master' of github.com:Airead/airemacs.d

Conflicts:
	.emacs
add short cut C-c g for magit-status