update bootstrap 3.1.1. Fix bug
Fix Readme conflict