Added AUTHORS file
Renamed AUTHORS to CONTRIBUTORS
Removed the TODO fil
Deleted README
Added authors file
Deleted authors file
Added python module power
power
Added a python script
Modified contributors
Added documentation'
Merge branch 'my_new_branch'
Added some documentation
Added documentation
Merge development onto master
Merge remote-tracking branch 'origin/master'

Conflicts:
	CONTRIBUTORS
	power.py