merge
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING
merge