Eliminated media type
Merge branch 'master' of github.com:stevepm/vc_wars