Merge pull request #1 from Lifespark/master

Merge root changes to design
Merge pull request #2 from Lifespark/LifeSparkDesign

Merge pull request #1 from Lifespark/master