first commit
Merge branch 'master' of https://github.com/mrjd26/friendly_media