aa
Merge branch 'master' of https://github.com/MasWag/MasWag-.emacs.d
made inits
added file
added elpa to .gitignore