sorted out merge conflict
before adding jsfiddle stuff
added bootstrap on menu bar
css changes, added bootstrap for profile