user wallet default added
unfinished stuff
unfinished changes
Merge branch 'master' into UItest

* master: (23 commits)
  fixed bower json
  small change to match controller
  delete duplicate seed entry
  change summoners per page from 5 to 3
  refactor pagination and clean up html
  include pagination module in summoner search page
  edit
  basic match page layout up
  add styles to summoner_search
  basic betting layout complete
  displays message if user is online
  refactor
  refactor
  user search displays live game information
  mashape key
  edit
  add summoner views for summoner search page
  refactor search controller and view code
  clean up controller and view code
  list users in /summoners_search
  ...
added chatango and some recent matches  hover effect does not work
Still unfinished UI stuff
endgame displays the winner and loser and updates active state to false. Wallet money has not been transferred
Merge branch 'master' of https://github.com/kkwoker/lol_bet

* 'master' of https://github.com/kkwoker/lol_bet:
  merging
  Working on blockchain api
  Blockchain request in progress
  added route
  generated controller
  improving betting
  Bitcoin transaction model added
reverted to return match even when there is no opponent bidder
match only shows once
Merge branch 'master' of https://github.com/kkwoker/lol_bet

* 'master' of https://github.com/kkwoker/lol_bet:
  improve search page
  refactor
match in db now updates with winner
Merge branch 'master' of https://github.com/kkwoker/lol_bet

* 'master' of https://github.com/kkwoker/lol_bet:
  implementing bitcoin deposit
  btc transaction page up
  updated readme
removed a space
Merge branch 'endGame'

* endGame:
  match in db now updates with winner
conflicts
fixed search
edit
Merge branch 'user-search'
champIds changed to champImg.