added power budget
Merge branch 'master'

Conflicts:
	BaselineMain/bibliography/bibliography.bib
Merge branch 'master' of https://github.com/tmkhoyan/baselinereport