Using PHPStorm to Resolve Merge Conflicts Without Using PHPStorm

Hyperion by Dan Simmons

Happy City by Charles Montgomery

Chasm City by Alistair Reynolds

Using Newsbeuter and VLC for YouTube Videos