init

init
Merge branch 'master' of https://github.com/twocabbages/web-im

Conflicts:
	assets/amr/js/io.js
	assets/record/recordmp3.js
	bower.json
	bower_components/bootstrap/.bower.json
	bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css
	bower_components/bootstrap/docs/assets/css/bootstrap.css
	bower_components/bootstrap/docs/assets/css/docs.css

bower_components/bootstrap/docs/assets/ico/apple-touch-icon-114-precompo
sed.png

bower_components/bootstrap/docs/assets/ico/apple-touch-icon-144-precompo
sed.png

bower_components/bootstrap/docs/assets/ico/apple-touch-icon-57-precompos
ed.png

bower_components/bootstrap/docs/assets/ico/apple-touch-icon-72-precompos
ed.png
	bower_components/bootstrap/docs/assets/ico/favicon.ico
	bower_components/bootstrap/docs/assets/ico/favicon.png
	bower_components/bootstrap/docs/assets/img/bootstrap-docs-readme.png
	bower_components/bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
	bower_components/bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
	bower_components/bootstrap/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg

bower_components/bootstrap/docs/assets/img/bs-docs-bootstrap-features.pn
g
	bower_components/bootstrap/docs/assets/img/bs-docs-masthead-pattern.png

bower_components/bootstrap/docs/assets/img/bs-docs-responsive-illustrati
ons.png
	bower_components/bootstrap/docs/assets/img/bs-docs-twitter-github.png
	bower_components/bootstrap/docs/assets/img/example-sites/8020select.png

bower_components/bootstrap/docs/assets/img/example-sites/adoptahydrant.p
ng

bower_components/bootstrap/docs/assets/img/example-sites/breakingnews.pn
g
	bower_components/bootstrap/docs/assets/img/example-sites/fleetio.png

bower_components/bootstrap/docs/assets/img/example-sites/gathercontent.p
ng
	bower_components/bootstrap/docs/assets/img/example-sites/jshint.png
	bower_components/bootstrap/docs/assets/img/example-sites/kippt.png
	bower_components/bootstrap/docs/assets/img/example-sites/soundready.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-ca
rousel.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-fl
uid.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-ju
stified-nav.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-ma
rketing-narrow.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-ma
rketing.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-si
gnin.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-st
arter.png

bower_components/bootstrap/docs/assets/img/examples/bootstrap-example-st
icky-footer.png

bower_components/bootstrap/docs/assets/img/examples/browser-icon-chrome.
png

bower_components/bootstrap/docs/assets/img/examples/browser-icon-firefox
.png

bower_components/bootstrap/docs/assets/img/examples/browser-icon-safari.
png
	bower_components/bootstrap/docs/assets/img/examples/slide-01.jpg
	bower_components/bootstrap/docs/assets/img/examples/slide-02.jpg
	bower_components/bootstrap/docs/assets/img/examples/slide-03.jpg

bower_components/bootstrap/docs/assets/img/glyphicons-halflings-white.pn
g
	bower_components/bootstrap/docs/assets/img/glyphicons-halflings.png
	bower_components/bootstrap/docs/assets/img/grid-baseline-20px.png
	bower_components/bootstrap/docs/assets/img/less-logo-large.png
	bower_components/bootstrap/docs/assets/img/responsive-illustrations.png
	bower_components/bootstrap/docs/assets/js/README.md
	bower_components/bootstrap/docs/assets/js/application.js
	bower_components/bootstrap/docs/assets/js/bootstrap-affix.js
	bower_components/bootstrap/docs/assets/js/bootstrap-alert.js
	bower_components/bootstrap/docs/assets/js/bootstrap-button.js
	bower_components/bootstrap/docs/assets/js/bootstrap-carousel.js
	bower_components/bootstrap/docs/assets/js/bootstrap-collapse.js
	bower_components/bootstrap/docs/assets/js/bootstrap-dropdown.js
	bower_components/bootstrap/docs/assets/js/bootstrap-modal.js
	bower_components/bootstrap/docs/assets/js/bootstrap-popover.js
	bower_components/bootstrap/docs/assets/js/bootstrap-scrollspy.js
	bower_components/bootstrap/docs/assets/js/bootstrap-tab.js
	bower_components/bootstrap/docs/assets/js/bootstrap-tooltip.js
	bower_components/bootstrap/docs/assets/js/bootstrap-transition.js
	bower_components/bootstrap/docs/assets/js/bootstrap-typeahead.js
	bower_components/bootstrap/docs/assets/js/bootstrap.js
	bower_components/bootstrap/docs/assets/js/bootstrap.min.js

bower_components/bootstrap/docs/assets/js/google-code-prettify/prettify.
css

bower_components/bootstrap/docs/assets/js/google-code-prettify/prettify.
js
	bower_components/bootstrap/docs/assets/js/html5shiv.js
	bower_components/bootstrap/docs/assets/js/jquery.js
	bower_components/jquery-cookie/.bower.json
	bower_components/jquery-cookie/jquery.cookie.js
	bower_components/jquery/.bower.json
	index.html