get block in angular from node!
Merge branch 'master' into feature/blockpage

Conflicts:
	app/models/Block.js
	config/routes.js

Fixed!
For blocks info, we always use controller blocks. Index controller only render homepage
added new route /blocks
Merge branch 'feature/blockpage' into feature/blocklist-page
Frontend: Blocks controller for angularjs
adds heights to block
Merge branch 'bug/missing-height-in-block' of https://github.com/matiu/mystery into feature/blockpage
block page draft
Merge pull request #1 from maraoz/feature/gitignore

added node.js ignores
Added new Angular views for block list
added new route
added new blocklist page
conflict solved
Merge pull request #3 from matiu/master

master to master
fix url for block info
fix API doc
Merge pull request #4 from matiu/feature/test-feature

fix API documentation
Merge remote-tracking branch 'bitpay/master' into feature/prototype-p2p