Add bootstrap
Add design
Resolve conflict
Merge branch 'mrBeck-master'