Add component time calculation and table
Merge branch 'calculate'

Conflicts:
	js/main.js
Merge pull request #20 from dklawren/master

removed js/dash.js
Merge branch 'master', remote branch 'upstream/master'
fixed variable collision