Fixed submodule conflicts
Added apoklinon colours to bashrc