modified bower.json
Merge branch 'master' of https://github.com/gengo/jericho
changed backgroud color of body
changed backgroud color of body
added bower.json
correct to wrap double quotes
added box class
changed background color
removed unecessary dir
added ignore
added ignore
Merge pull request #2 from toshipon/v2_branch

changed background color of body and added box class
merge conflicts
Merge pull request #1 from gengo/v2_branch

Update V2 using pure bootstrap
change bower version
Merge remote-tracking branch 'origin/master' into v2_branch

* origin/master:
  change bower version
  added ignore
  added ignore
  removed unecessary dir
  changed background color
  added box class
  correct to wrap double quotes
  added bower.json
  changed backgroud color of body
  changed backgroud color of body
  modified bower.json

Conflicts:
	docs/assets/css/jericho.css
	jericho.css