add bootstrap css and improve design
resolve conficts and add gitignore