+Bootstrap & +Test commit and push to heroku
+Test
afsd
Merge branch 'master' of heroku.com:tranquil-taiga-1581

Conflicts:
	views/index.erb
Test
+navBar
+style
adjust softphone style top margin for nav
+salesforce logo & some style tweaks
fix salesforce image src url
fix sfdc image
more image fixes
more effing with image
+more
+more
+more
adsf
asdf
asdf
asf