Merge branch 'master', remote branch 'upstream/master'
Add component time calculation and table
removed js/dash.js
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
Merge pull request #21 from dklawren/master

fixed variable name collision
Add curly braces
Merge pull request #22 from alicoding/braces

Add curly braces
Add return
Merge pull request #24 from alicoding/return

Add return