added row-fluid divs
Changed web.js for merge conflict demo
Changed web.js for merge conflict demo
resolve merge conflit
added addthis
Merge branch 'develop'
added GA for heroku
Merge branch 'develop'
added bitcoin pay button
Merge branch 'develop'