Adding bootstrap 3
Pulling merge