added jellybeans theme
fixed gitmodules conflict