Winner mode on
Added workgroups
Move keybindings to 006-keys.el, Bind M-j to C-u join-line
Update submodules
Merge branch 'windows' of https://github.com/r-darwish/emacs into windows
If no region is marked, C-w will kill the last word
Solarized theme
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into unstable

Conflicts:
	parts/006-keys.el