Merge pull request #31 from XboxLeaders/develop

Merge Develop into Master
Merge pull request #32 from XboxLeaders/develop

Massive commit of PSR and other formatting fixes
friends total fix
Merge pull request #34 from XboxLeaders/develop

Source documentation and friends fix
Merge pull request #35 from XboxLeaders/master

Merging master into develop