Quickopen in emacs and remove color theme stuff.
Android stuff
Merge branch 'master' of github.com:ibrahima/dotfiles

Conflicts:
	.emacs.d/init.el