added bootstrap 3
merge files