EWWEMEL
Merge pull request #381 from pachalad/master

EWWEMEL
Merge pull request #380 from cchan5/master

Added javadocs
creating picture test
Fixing merge conflict
Merge remote-tracking branch 'upstream/master'
Fixing merge conflict

Merge remote-tracking branch 'upstream/master'
Merge pull request #382 from iameric1986/master

More Junit tests
Changed the name of a test class
Merge pull request #383 from iameric1986/master

Changed the name of a test class
Merge remote-tracking branch 'upstream/master'
added picture unit testing and changed the adding pic to answer
Merge pull request #384 from rjynn/master

added picture unit testing and changed adding pic to answer
I WIN
Merge pull request #385 from iameric1986/master

I WIN
GreenAdvisor folder added
Merge pull request #386 from iameric1986/master

GreenAdvisor folder added
Added power report