Merged local and online repository
Merge branch 'elements' into teacher

Conflicts:
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c.html
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c_a79cd2ba7236d8017474e3340e169f888_cgraph.map
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c_a79cd2ba7236d8017474e3340e169f888_cgraph.md5
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.map
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5
	DevelopingComputerProgramming/DoxygenOutput/html/_expression_calc_8c_source.html
	DevelopingComputerProgramming/DoxygenOutput/html/_r_e_a_d_m_e_8md.html
	DevelopingComputerProgramming/DoxygenOutput/html/_r_e_a_d_m_e_8md_source.html
	DevelopingComputerProgramming/DoxygenOutput/html/files.html
	DevelopingComputerProgramming/DoxygenOutput/html/globals.html
	DevelopingComputerProgramming/DoxygenOutput/html/globals_func.html
	DevelopingComputerProgramming/DoxygenOutput/html/graph_legend.html
	DevelopingComputerProgramming/DoxygenOutput/html/index.html
	DevelopingComputerProgramming/DoxygenOutput/html/pages.html
	DevelopingComputerProgramming/DoxygenOutput/latex/_expression_calc_8c.tex
	DevelopingComputerProgramming/DoxygenOutput/latex/_expression_calc_8c_a79cd2ba7236d8017474e3340e169f888_cgraph.md5
	DevelopingComputerProgramming/DoxygenOutput/latex/_expression_calc_8c_ae66f6b31b5ad750f1fe042a706a4e3d4_cgraph.md5
	DevelopingComputerProgramming/DoxygenOutput/latex/refman.tex
	DevelopingComputerProgramming/ExpressionCalc
	DevelopingComputerProgramming/ExpressionCalc.c
fixed teacher branch