Merged master into timeline
Merge branch 'master' into timeline

Conflicts:
	output/output.html
	output/style.css
static timeline
Merge branch 'timeline'
fixed side pannel + called function chart
Merge branch 'sidePannel'

Conflicts:
	output/output.html
	output/style.css