fix conflicts

README.md

@@ -1,2 +1,10 @@
 mystery
 =======
+
+
+## bitcoind configuration
+
+  There is a bitcoind configuration sample at:
+```
+    etc/mystery/bitcoin.conf
+```:

app/views/includes/head.jade

@@ -3,7 +3,7 @@ head
   meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
   meta(name='viewport', content='width=device-width,initial-scale=1.0')
 
-  title BitPay
+  title Mystery
   meta(http-equiv='Content-type', content='text/html;charset=UTF-8')
   meta(name="keywords", content="node.js, express, mongoose, mongodb, angularjs")
   meta(name="description", content="Mystery")
@@ -12,4 +12,4 @@ head
   
   link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css')
   link(rel='stylesheet', href='/css/common.css')
-  
+  

app/views/index.jade

@@ -3,3 +3,22 @@ extends layouts/default
 block content
   .page-header
     h1 Hello BitPay!
+  p ˈmɪst(ə)ri/'
+    | noun
+    audio(src="https://ssl.gstatic.com/dictionary/static/sounds/de/0/mystery.mp3",preload="auto",data-dobid="aud",id="aud")
+    button(onclick="document.getElementById('aud').play()") Play
+  
+  ol
+    li 
+      strong something that is difficult or impossible to understand or explain.
+      p "the mysteries of outer space"
+      | synonyms:	puzzle, enigma, conundrum, riddle, secret, unsolved problem, problem, question, question mark, closed book; secrecy or obscurity.
+      p "much of her past is shrouded in mystery"
+      | synonyms:	secrecy, darkness, obscurity, ambiguity, ambiguousness, uncertainty, impenetrability, vagueness, nebulousness; More
+    li
+      strong a person or thing whose identity or nature is puzzling or unknown.
+      p "‘He's a bit of a mystery,’ said Nina"
+    li 
+      strong  a novel, play, or film dealing with a puzzling crime, especially a murder.
+      p "the 1920s murder mystery, The Ghost Train"
+      | synonyms:	thriller, detective story/novel, murder story; More

config/routes.js

@@ -6,4 +6,7 @@ module.exports = function(app) {
   var index = require('../app/controllers/index');
   app.get('/', index.render);
 
+  //TX routes
+  //
+
 };

etc/bitcoind/bitcoin.conf

@@ -0,0 +1,12 @@
+rpcuser=mystery
+rpcpassword=real_mystery
+server=1
+rpcallowip=127.0.0.1
+rpcport=8332
+testnet=1
+txindex=1
+
+
+
+
+

package.json

@@ -36,6 +36,7 @@
     "jade": "~1.0.2",
     "mongoose": "~3.8.3",
     "lodash": "~2.4.1",
-    "bower": "~1.2.8"
+    "bower": "~1.2.8",
+    "bitcore": "*"
   }
 }