...
fixing confolicts
....
commiting after 2nd merge
almost finished browse bets page, added connection with json files
fixing conflict
all files commited