u
Update
Merge branch 'master' of https://github.com/jashook/sci-comp

Conflicts:
	project_4/carbon/C.txt
	project_4/carbon/C_12hour.txt
	project_4/carbon/C_1hour.txt
	project_4/carbon/C_24hour.txt
	project_4/carbon/C_48hour.txt
	project_4/carbon/C_6hour.txt