Updated .gitignore file
Merge branch 'master' of https://github.com/mediasilo/phoenix-php-sdk into buttoning-up-compatibility
Added /me endpoint. Updates Asset and AssetProxy to use phoenix buttoning-up branch
Updated docs
Merge pull request #5 from mediasilo/comments

Added support for commenting on quick link assets
Merge pull request #11 from mediasilo/comments

Comments
Merge pull request #12 from mediasilo/comments

removed debug code
Merge branch 'master' of https://github.com/mediasilo/phoenix-php-sdk into buttoning-up-compatibility

Conflicts:
	src/mediasilo/MediaSiloAPI.php
	src/mediasilo/asset/Asset.php
	src/mediasilo/asset/AssetProxy.php
	src/mediasilo/role/RoleManager.php
Fixed bugs
Merge pull request #7 from stilesb/buttoning-up-compatibility

Buttoning up Compatibility
Merged master