sam/PDI - Progetto Didattico Interdisciplinare SAM

	Commit message (Expand)	Author	Files	Lines
2017-02-12	merged alan's work	Nao Pross	1	-0/+16
2017-02-12	fixed layout stuff	Nao Pross	4	-61/+59
2017-02-05	fixed plot @ 3.5.1 and written some stuff	Nao Pross	3	-20/+37
2017-02-05	written section 3.5.1 - todo: 3.5.2	Nao Pross	2	-49/+104
2017-01-29	'american english is wrong'	Nao Pross	2	-57/+43
2017-01-29	finished energy production	Nao Pross	4	-146/+425
2017-01-29	added consumption histograms	Nao Pross	2	-23/+154
2017-01-29	updated calc tables and modified alan's work	NaoPross	2	-7/+25
2017-01-28	merged alan's work and fixed margins & captions	Nao Pross	2	-3/+50
2017-01-24	work done at school	Nao Pross	2	-29/+35
2017-01-06	cleaned up structure and finished renewables production	Nao Pross	1	-137/+283
2017-01-05	merged alan's work	Nao Pross	2	-5/+36
2017-01-05	added histograms layout	Nao Pross	1	-1/+111
2017-01-02	fixed tables and page layouts	Nao Pross	1	-53/+58
2017-01-02	fixing nuclear	Nao Pross	1	-17/+2
2016-12-20	renamed 'docs' to 'doc'	Nao Pross	5	-0/+492