VLC project compiled
Merge branch 'master' of https://github.com/pepibumur/Popcorn-Time-iOS

Conflicts:
	.gitignore