week 2 commit 14

Variables for final calculation are calculated
week 2 commit 15

Industry complete