Add component time calculation and table
Merge branch 'calculate'

Conflicts:
	js/main.js