initial commit
initial commit
fixed conflics
removed .bashrc_custom from public git