modified bower.json
Merge branch 'master' of https://github.com/gengo/jericho
changed backgroud color of body
changed backgroud color of body
merge conflicts