voltage -> watts
Merge branch 'master' of https://github.com/mem-comp4081-2014fall/comp_app