clean commit
got rid of output file for git
resolving merges
Adding the 4 class power problem
Resolved merge conflict regarding 4 power sensor problem