updated some scripts and removed useless files
fixing some conflicts
added updated .bashrc file