Test
Removed file
added power.py
te
mod
edit
test:
Merge branch 'new_branch'
empty file
edit:
ufhuierheg
Merge branch 'master' of http://github.com/NelleV/SCBC-data

Conflicts:
	power.py