altered to new structure, added content
Merge pull request #6 from Quadrophone/master

pully pully pull