- Base Commit
Merge branch 'master' of https://github.com/PlaySwell/swell_media

Conflicts:
	README.md