#1: building an node.js app is hard
#1: fixing my first conflict with a PULL-CONFLICT-FIX-ADD-COMMIT-PUSH