Merge branch 'master' of Github.

Check https://github.com/Reylak/Grid5000-power-measurements.git

Conflicts:
	.gitignore
	README.md
	expPWM.sh
	experimentsPowerMeasurement
	experimentsPowerMeasurement.py
	powerMeasurement
	powerMeasurement.py
	powerMeasurementModule.py

git-svn-id: https://wwwsecu.irit.fr/svn/nrj/code/g5k_tools@2195 39c7c407-2421-4461-abc4-38d768528ff4
Add 'expPWM.sh' to the release package.

git-svn-id: https://wwwsecu.irit.fr/svn/nrj/code/g5k_tools@2196 39c7c407-2421-4461-abc4-38d768528ff4
Typoe in comment (thank you Ilja Kroonen).
Merge remote-tracking branch 'GitHub/master'