Update init.el

added marmalade in order to install magit and more