Moving to airplay native library
Merge branch 'master' of git://github.com/mafintosh/peerflix

Conflicts:
	app.js
	package.json
Adding cli option for AirPlay
Merge pull request #95 from guerrerocarlos/master

Using native AirPlay-js module
style changes for #95
0.13.0
Using my version of torrent-stream
Use correct torrent-stream version
Merge pull request #96 from jamiees2/master

Bump torrent-stream version
0.13.1
Merge branch 'master' into rar2

Conflicts:
	package.json