Revert bd83fa2..57e98e3

This rolls back to commit bd83fa26f0a6dfad9dbb0d47d47484ffa0f903ca.
added sample .bashrc
Merge branch 'testing'

Conflicts:
	docs/plots/data/shgC.sm_xxx_64_half-slab_5-nospin_scissor_0_Nc_26
	docs/plots/data/shgC.sm_xxz_64_half-slab_5-nospin_scissor_0_Nc_26
	docs/plots/data/shgC.sm_zxx_64_half-slab_5-nospin_scissor_0_Nc_26
	docs/plots/data/shgC.sm_zzz_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/bulk/nospin/gaas/gaas.xyz
	examples/bulk/nospin/gaas/hexa/.machines_latm.original
	examples/bulk/nospin/gaas/hexa/.machines_pmn.original
	examples/bulk/nospin/gaas/hexa/.machines_res.original
	examples/bulk/nospin/gaas/hexa/.machines_scf.original
	examples/bulk/nospin/gaas/quad/.machines_latm.original
	examples/bulk/nospin/gaas/quad/.machines_pmn.original
	examples/bulk/nospin/gaas/quad/.machines_res.original
	examples/bulk/nospin/gaas/quad/.machines_scf.original

examples/bulk/nospin/gaas/res/shgL.kk_xyz_27720_20-nospin_scissor_1.0466
97_Nc_7

examples/bulk/nospin/gaas/res/shgL.sm_xyz_27720_20-nospin_scissor_1.0466
97_Nc_7

examples/bulk/nospin/gaas/res/shgV.kk_xyz_27720_20-nospin_scissor_1.0466
97_Nc_7

examples/bulk/nospin/gaas/res/shgV.sm_xyz_27720_20-nospin_scissor_1.0466
97_Nc_7
	examples/bulk/nospin/gaas/setUpAbinit_gaas.in
	examples/gaas/gaas.xyz
	examples/gaas/hexa/.machines_latm.original
	examples/gaas/hexa/.machines_pmn.original
	examples/gaas/hexa/.machines_res.original
	examples/gaas/hexa/.machines_scf.original
	examples/gaas/quad/.machines_latm.original
	examples/gaas/quad/.machines_pmn.original
	examples/gaas/quad/.machines_res.original
	examples/gaas/quad/.machines_scf.original
	examples/gaas/res/shgL.kk_xyz_27720_20-nospin_scissor_1.046697_Nc_7
	examples/gaas/res/shgL.sm_xyz_27720_20-nospin_scissor_1.046697_Nc_7
	examples/gaas/res/shgV.kk_xyz_27720_20-nospin_scissor_1.046697_Nc_7
	examples/gaas/res/shgV.sm_xyz_27720_20-nospin_scissor_1.046697_Nc_7
	examples/gaas/setUpAbinit_gaas.in
	examples/si_as_6/hexa/.machines_latm.original
	examples/si_as_6/hexa/.machines_pmn.original
	examples/si_as_6/hexa/.machines_res.original
	examples/si_as_6/hexa/.machines_scf.original
	examples/si_as_6/quad/.machines_latm.original
	examples/si_as_6/quad/.machines_pmn.original
	examples/si_as_6/quad/.machines_res.original
	examples/si_as_6/quad/.machines_scf.original
	examples/si_as_6/res/shgC.kk_xxx_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.kk_xxz_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.kk_zxx_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.kk_zzz_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.sm_xxx_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.sm_xxz_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.sm_zxx_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/res/shgC.sm_zzz_64_half-slab_5-nospin_scissor_0_Nc_26
	examples/si_as_6/rvarios-shg.sh
	examples/si_as_6/setUpAbinit_si_as_6.in
	examples/si_as_6/si_as_6.xyz
	examples/si_as_h_7/.machines_latm
	examples/si_as_h_7/.machines_pmn.original
	examples/si_as_h_7/.machines_res
	examples/si_as_h_7/.machines_scf.original
	examples/si_as_h_7/setUpAbinit_si_as_h_7L.in
	examples/si_as_h_7/si_as_h_7L.xyz.original
	examples/surface/.machines_latm.original
	examples/surface/.machines_res.original
	examples/surface/nospin/si_as_6/hexa/.machines_latm.original
	examples/surface/nospin/si_as_6/hexa/.machines_pmn.original
	examples/surface/nospin/si_as_6/hexa/.machines_res.original
	examples/surface/nospin/si_as_6/hexa/.machines_scf.original
	examples/surface/nospin/si_as_6/quad/.machines_pmn.original
	examples/surface/nospin/si_as_6/quad/.machines_scf.original

examples/surface/nospin/si_as_6/res/shgC.kk_xxx_64_half-slab_5-nospin_sc
issor_0_Nc_26

examples/surface/nospin/si_as_6/res/shgC.kk_xxz_64_half-slab_5-nospin_sc
issor_0_Nc_26

examples/surface/nospin/si_as_6/res/shgC.kk_zxx_64_half-slab_5-nospin_sc
issor_0_Nc_26

examples/surface/nospin/si_as_6/res/shgC.kk_zzz_64_half-slab_5-nospin_sc
issor_0_Nc_26
	examples/surface/nospin/si_as_6/rvarios-shg.sh
	examples/surface/nospin/si_as_6/setUpAbinit_si_as_6.in
	examples/surface/nospin/si_as_6/si_as_6.xyz
	examples/surface/nospin/si_as_h_7/.machines_latm
	examples/surface/nospin/si_as_h_7/.machines_pmn.original
	examples/surface/nospin/si_as_h_7/.machines_res
	examples/surface/nospin/si_as_h_7/.machines_scf.original
	examples/surface/nospin/si_as_h_7/setUpAbinit_si_as_h_7L.in
	examples/surface/nospin/si_as_h_7/si_as_h_7L.xyz.original
	manual/2tutorial.tex
	manual/logo-cio-nuevo.jpg
	manual/plots/3drho.eps
	manual/plots/3drho.g
	manual/plots/3drho.pdf
	manual/plots/data/shgC.sm_xxx_64_half-slab_5-nospin_scissor_0_Nc_26
	manual/plots/data/shgC.sm_xxx_64_half-slab_5-nospin_scissor_1_Nc_13
	manual/plots/data/shgC.sm_xxz_64_half-slab_5-nospin_scissor_0_Nc_26
	manual/plots/data/shgC.sm_xxz_64_half-slab_5-nospin_scissor_1_Nc_13
	manual/plots/data/shgC.sm_zxx_64_half-slab_5-nospin_scissor_0_Nc_26
	manual/plots/data/shgC.sm_zxx_64_half-slab_5-nospin_scissor_1_Nc_13
	manual/plots/data/shgC.sm_zzz_64_half-slab_5-nospin_scissor_0_Nc_26
	manual/plots/data/shgC.sm_zzz_64_half-slab_5-nospin_scissor_1_Nc_13
	manual/plots/data/shgL.kk_xyz_1661_20-nospin_scissor_1.051_Nc_7
	manual/plots/data/shgL.sm_xyz_1661_20-nospin_scissor_1.051_Nc_4
	manual/plots/data/shgL.sm_xyz_1661_20-nospin_scissor_1.051_Nc_7
	manual/plots/data/shgV.kk_xyz_1661_20-nospin_scissor_1.051_Nc_7
	manual/plots/data/shgV.sm_xyz_1661_20-nospin_scissor_1.051_Nc_4
	manual/plots/data/shgV.sm_xyz_1661_20-nospin_scissor_1.051_Nc_7
	manual/plots/rhoz_1
	manual/plots/shg-bulk.eps
	manual/plots/shg-bulk.g
	manual/plots/shg-bulk.pdf
	manual/plots/shg-surface.eps
	manual/plots/shg-surface.g
	manual/plots/shg-surface.pdf
	pseudopotentials/hgh/10ne.8.hgh
	pseudopotentials/hgh/14si.4.hgh
	pseudopotentials/hgh/14si.4.hgh_zero-so
	pseudopotentials/hgh/1h.1.hgh
	pseudopotentials/hgh/31ga.3.hgh
	pseudopotentials/hgh/32ge.4.hgh
	pseudopotentials/hgh/33as.5.hgh
	pseudopotentials/hgh/34se.6.hgh
	pseudopotentials/hgh/48cd.2.hgh
	pseudopotentials/hgh/49in.3.hgh
	pseudopotentials/hgh/51sb.5.hgh
	pseudopotentials/pspnc/14si.pspnc
	pseudopotentials/pspnc/1h.pspnc
	pseudopotentials/pspnc/31ga.pspnc
	pseudopotentials/pspnc/33as.pspnc
	psp/14si.4.hgh
	psp/14si.4.hgh_original
	psp/14si.4.hgh_zero-so
	psp/14si.pspnc
	psp/1h.1.hgh
	psp/1h.pspnc
	psp/31ga.3.hgh
	psp/31ga.pspnc
	psp/32ge.4.hgh
	psp/33as.5.hgh
	psp/33as.pspnc
	psp/34se.6.hgh
	psp/48cd.2.hgh
	psp/49in.3.hgh
	psp/51sb.5.hgh
	sample_bashrc
	ver1.0/clustering/itaxeo/compita.f90
	ver1.0/clustering/itaxeo/compita_itanium
	ver1.0/clustering/itaxeo/compita_quad
	ver1.0/clustering/itaxeo/compita_xeon
	ver1.0/examples/surface/.machines_latm.original
	ver1.0/examples/surface/.machines_pmn.original
	ver1.0/examples/surface/.machines_res.original
	ver1.0/examples/surface/.machines_scf.original
	ver1.0/examples/surface/si_as_6L.xyz
	ver1.0/examples/surface/si_as_h_7L/.machines_latm
	ver1.0/examples/surface/si_as_h_7L/.machines_pmn.original
	ver1.0/examples/surface/si_as_h_7L/.machines_res
	ver1.0/examples/surface/si_as_h_7L/.machines_scf.original
	ver1.0/examples/surface/si_as_h_7L/si_as_h_7L.xyz
	ver1.0/free-memory
	ver1.0/howtickslab/info.f90_respaldo
	ver1.0/kk/a.out
	ver1.0/kk/rkk_old
	ver1.2/clustering/itaxeo/compita_hexa
	ver1.2/examples/surface/.machines_latm.original
	ver1.2/examples/surface/.machines_res.original
	ver1.2/examples/surface/si_as_h_7L/.machines_latm
	ver1.2/psp/14si.4.hgh
	ver1.2/psp/14si.4.hgh_original
	ver1.2/psp/14si.4.hgh_zero-so
	ver1.2/psp/14si.pspnc
	ver1.2/psp/1h.1.hgh
	ver1.2/psp/1h.pspnc
	ver1.2/psp/31ga.3.hgh
	ver1.2/psp/31ga.pspnc
	ver1.2/psp/32ge.4.hgh
	ver1.2/psp/33as.5.hgh
	ver1.2/psp/33as.pspnc
	ver1.2/psp/34se.6.hgh
	ver1.2/psp/48cd.2.hgh
	ver1.2/psp/49in.3.hgh
	ver1.2/psp/51sb.5.hgh
	ver2.0/examples/bulk/nospin/gaas/gaas.xyz
	ver2.0/examples/bulk/nospin/gaas/hexa/.machines_latm.original
	ver2.0/examples/bulk/nospin/gaas/hexa/.machines_pmn.original
	ver2.0/examples/bulk/nospin/gaas/hexa/.machines_res.original
	ver2.0/examples/bulk/nospin/gaas/hexa/.machines_scf.original
	ver2.0/examples/bulk/nospin/gaas/quad/.machines_pmn.original
	ver2.0/examples/bulk/nospin/gaas/quad/.machines_res.original
	ver2.0/examples/bulk/nospin/gaas/quad/.machines_scf.original

ver2.0/examples/bulk/nospin/gaas/res/shgL.kk_xyz_27720_20-nospin_scissor
_1.046697_Nc_7

ver2.0/examples/bulk/nospin/gaas/res/shgL.sm_xyz_27720_20-nospin_scissor
_1.046697_Nc_7

ver2.0/examples/bulk/nospin/gaas/res/shgV.kk_xyz_27720_20-nospin_scissor
_1.046697_Nc_7

ver2.0/examples/bulk/nospin/gaas/res/shgV.sm_xyz_27720_20-nospin_scissor
_1.046697_Nc_7
	ver2.0/examples/bulk/nospin/gaas/setUpAbinit_gaas.in
	ver2.0/examples/surface/nospin/si_as_6/hexa/.machines_latm.original
	ver2.0/examples/surface/nospin/si_as_6/hexa/.machines_pmn.original
	ver2.0/examples/surface/nospin/si_as_6/hexa/.machines_res.original
	ver2.0/examples/surface/nospin/si_as_6/hexa/.machines_scf.original
	ver2.0/examples/surface/nospin/si_as_6/quad/.machines_pmn.original
	ver2.0/examples/surface/nospin/si_as_6/quad/.machines_scf.original

ver2.0/examples/surface/nospin/si_as_6/res/shgC.kk_xxx_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.kk_xxz_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.kk_zxx_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.kk_zzz_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.sm_xxx_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.sm_xxz_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.sm_zxx_64_half-slab_5-no
spin_scissor_0_Nc_26

ver2.0/examples/surface/nospin/si_as_6/res/shgC.sm_zzz_64_half-slab_5-no
spin_scissor_0_Nc_26
	ver2.0/examples/surface/nospin/si_as_6/rvarios-shg.sh
	ver2.0/examples/surface/nospin/si_as_6/setUpAbinit_si_as_6.in
	ver2.0/examples/surface/nospin/si_as_h_7/setUpAbinit_si_as_h_7L.in
	ver2.0/utils/all_responses.sh~
Merge branch 'master' into work
updated a new bad ass read me
fixed list
fixed readme list
added picture to read me
added a few labels to integrands.f90
dogy?
Merge branch 'master' into testing

Conflicts:
	README