first commit
Merge https://github.com/chrispyperez/media.app