bootstrap added
angular & bootstrap set up
merging with tim