Solving Merge Conflicts and XOR Problem

stream #119

In this live stream, I go through pull requests on the JavaScript neural network library repo and take another crack at the XOR coding challenge.