testing 2
Merge branch 'master' of github.com:kumar-physics/general-scripts

Conflicts:
	rscripts/eppic_2_1_0_2014_05_plots.R