Merge pull request #1 from TechShroom/master

Updating Fork
Media API 1.0
Organized Media API
Merge pull request #2 from TechShroom/master

Change to Java Conventions formatter.
Formatted Code
Merge pull request #15 from danmw3/master

Media API 1.0 from Dan