Removed /bin/ and /gen/ files from repo. To recreate locally, use 'Project->Clean' in Eclipse and recompile.
Added basic media file types. Exact implementation should be discussed.
Added javadoc to Media.java
Merge branch 'master' into jhchu