Was a Hell of a Ride
Update README.md
Merge https://github.com/popcorn-time/popcorn-app into popcorn-master

Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	index.html
	js/app.js
	js/frontend/controllers/filter.js
	js/frontend/controllers/home.js
	js/frontend/controllers/search.js
	js/frontend/models/movie.js
	js/frontend/player.js
	js/frontend/providers/themoviedb.js
	js/frontend/providers/yifysubtitles.js
	js/frontend/ui.js
	js/frontend/views/listview.js
	js/frontend/views/page.js
	js/frontend/views/sidebar.js
	js/vendor/videojsplugins.js
	language/en.json
	language/uk.json
	package.json
	sass/_layout.scss
	sass/_moviedetails.scss