Merge branch 'PowerUp_TestandClean' into PowerUPBeta
Merge branch 'PowerUPBeta' of https://github.com/zsweedyk/CS121F14S4_Team8 into PowerUPBeta