Bootstrap3 Version #2

Should be good to merge!