change menu background color and add twitter timeline
Merge branch 'master' of https://github.com/lorenzoMacca/myTraining.git

Conflicts:
	index2.php