added newest version of bootstrap, changed css

Signed-off-by: ArsenBatyuchok <arsen.batyuchok@gmail.com>
fixing conflict...