- using local fork of emacs eclim
- develop ws
Merge branch 'master' of github.com:skybert/my-little-friends

Conflicts:
	emacs/.eclimrc