11/05/14
11.05.14
Merge branch 'master' of github.com:davvelsan/r.student.uma

Conflicts:
	plant_phys_ii/lab_iii/README