Merge branch 'master' of github.com:beachygreg/zapoc

Conflicts:
	public/index.html
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 3 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   .gitignore
#	deleted:    public/bower_components/angular-socket-io/.bower.json
#	deleted:    public/bower_components/angular-socket-io/.gitignore
#	deleted:    public/bower_components/angular-socket-io/.travis.yml
#	deleted:    public/bower_components/angular-socket-io/README.md
#	deleted:    public/bower_components/angular-socket-io/bower.json
#	deleted:    public/bower_components/angular-socket-io/karma.conf.js
#	deleted:    public/bower_components/angular-socket-io/mock/socket-io.js
#	deleted:    public/bower_components/angular-socket-io/package.json
#	deleted:    public/bower_components/angular-socket-io/socket.js
#	deleted:    public/bower_components/angular-socket-io/socket.spec.js
#	deleted:    public/bower_components/angular-ui/.bower.json
#	deleted:    public/bower_components/angular-ui/.gitignore
#	deleted:    public/bower_components/angular-ui/.travis.yml
#	deleted:    public/bower_components/angular-ui/CHANGELOG.md
#	deleted:    public/bower_components/angular-ui/LICENSE
#	deleted:    public/bower_components/angular-ui/README.md
#	deleted:    public/bower_components/angular-ui/build/angular-ui-ieshiv.js
#	deleted:    public/bower_components/angular-ui/build/angular-ui-ieshiv.min.js
#	deleted:    public/bower_components/angular-ui/build/angular-ui.css
#	deleted:    public/bower_components/angular-ui/build/angular-ui.js
#	deleted:    public/bower_components/angular-ui/build/angular-ui.min.css
#	deleted:    public/bower_components/angular-ui/build/angular-ui.min.js
#	deleted:    public/bower_components/angular-ui/common/ieshiv/README.md
#	deleted:    public/bower_components/angular-ui/common/ieshiv/ieshiv.js
#	deleted:    public/bower_components/angular-ui/common/module.js
#	deleted:    public/bower_components/angular-ui/common/stylesheets/angular-ui.less
#	deleted:    public/bower_components/angular-ui/common/stylesheets/mixins.less
#	deleted:    public/bower_components/angular-ui/grunt.js
#	deleted:    public/bower_components/angular-ui/modules/directives/animate/animate.js
#	deleted:    public/bower_components/angular-ui/modules/directives/animate/test/animateSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/calendar/calendar.js
#	deleted:    public/bower_components/angular-ui/modules/directives/calendar/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/calendar/test/calendarSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/codemirror/codemirror.js
#	deleted:    public/bower_components/angular-ui/modules/directives/codemirror/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/codemirror/test/codemirrorSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/currency/README.md
#	deleted:    public/bower_components/angular-ui/modules/directives/currency/currency.js
#	deleted:    public/bower_components/angular-ui/modules/directives/currency/stylesheets/currency.less
#	deleted:    public/bower_components/angular-ui/modules/directives/currency/test/currencySpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/date/README.md
#	deleted:    public/bower_components/angular-ui/modules/directives/date/date.js
#	deleted:    public/bower_components/angular-ui/modules/directives/date/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/date/test/dateSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/event/event.js
#	deleted:    public/bower_components/angular-ui/modules/directives/event/test/eventSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/if/if.js
#	deleted:    public/bower_components/angular-ui/modules/directives/if/test/ifSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/jq/README.md
#	deleted:    public/bower_components/angular-ui/modules/directives/jq/jq.js
#	deleted:    public/bower_components/angular-ui/modules/directives/jq/test/jqSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/keypress/keypress.js
#	deleted:    public/bower_components/angular-ui/modules/directives/keypress/test/keydownSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/keypress/test/keypressSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/keypress/test/keyupSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/map/map.js
#	deleted:    public/bower_components/angular-ui/modules/directives/map/test/mapSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/mask/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/mask/mask.js
#	deleted:    public/bower_components/angular-ui/modules/directives/mask/test/maskSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/reset/reset.js
#	deleted:    public/bower_components/angular-ui/modules/directives/reset/stylesheets/reset.less
#	deleted:    public/bower_components/angular-ui/modules/directives/reset/test/resetSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/route/route.js
#	deleted:    public/bower_components/angular-ui/modules/directives/route/test/routeSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/scrollfix/scrollfix.js
#	deleted:    public/bower_components/angular-ui/modules/directives/scrollfix/test/scrollfixSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/select2/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/select2/select2.js
#	deleted:    public/bower_components/angular-ui/modules/directives/select2/test/select2Spec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/showhide/showhide.js
#	deleted:    public/bower_components/angular-ui/modules/directives/showhide/test/showhideSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/sortable/REDME.md
#	deleted:    public/bower_components/angular-ui/modules/directives/sortable/sortable.js
#	deleted:    public/bower_components/angular-ui/modules/directives/sortable/test/sortableSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/tinymce/dependencies.json
#	deleted:    public/bower_components/angular-ui/modules/directives/tinymce/test/tinymceSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/tinymce/tinymce.js
#	deleted:    public/bower_components/angular-ui/modules/directives/validate/test/validateSpec.js
#	deleted:    public/bower_components/angular-ui/modules/directives/validate/validate.js
#	deleted:    public/bower_components/angular-ui/modules/filters/format/format.js
#	deleted:    public/bower_components/angular-ui/modules/filters/format/test/formatSpec.js
#	deleted:    public/bower_components/angular-ui/modules/filters/highlight/highlight.js
#	deleted:    public/bower_components/angular-ui/modules/filters/highlight/highlight.less
#	deleted:    public/bower_components/angular-ui/modules/filters/highlight/test/highlightSpec.js
#	deleted:    public/bower_components/angular-ui/modules/filters/inflector/inflector.js
#	deleted:    public/bower_components/angular-ui/modules/filters/inflector/test/inflectorSpec.js
#	deleted:    public/bower_components/angular-ui/modules/filters/unique/test/uniqueSpec.js
#	deleted:    public/bower_components/angular-ui/modules/filters/unique/unique.js
#	deleted:    public/bower_components/angular-ui/package.json
#	deleted:    public/bower_components/angular-ui/templates/README.md
#	deleted:    public/bower_components/angular-ui/templates/dependencies.json
#	deleted:    public/bower_components/angular-ui/templates/stylesheets/template.less
#	deleted:    public/bower_components/angular-ui/templates/template.js
#	deleted:    public/bower_components/angular-ui/templates/test/templateSpec.js
#	deleted:    public/bower_components/angular-ui/test/lib/angular-1.0.1/angular-mocks.js
#	deleted:    public/bower_components/angular-ui/test/lib/angular-1.0.1/angular.js
#	deleted:    public/bower_components/angular-ui/test/lib/angular/angular-1.0.0rc4.js
#	deleted:    public/bower_components/angular-ui/test/lib/angular/angular-1.0.0rc5.js
#	deleted:    public/bower_components/angular-ui/test/lib/angular/angular-mocks.js
#	deleted:    public/bower_components/angular-ui/test/lib/bootstrap/bootstrap-modal.js
#	deleted:    public/bower_components/angular-ui/test/lib/calendar/calendar.js.min
#	deleted:    public/bower_components/angular-ui/test/lib/codemirror/codemirror.js
#	deleted:    public/bower_components/angular-ui/test/lib/googlemaps/googlemaps.js
#	deleted:    public/bower_components/angular-ui/test/lib/jquery/jquery-1.7.2.js
#	deleted:    public/bower_components/angular-ui/test/lib/jquery/jquery-ui-1.8.18.js
#	deleted:    public/bower_components/angular-ui/test/lib/maskedinput/jquery.maskedinput-1.3.js
#	deleted:    public/bower_components/angular-ui/test/lib/select2/select2.js
#	deleted:    public/bower_components/angular-ui/test/lib/tinymce/jquery.tinymce.js
#	deleted:    public/bower_components/angular-ui/test/lib/tinymce/tiny_mce.js
#	deleted:    public/bower_components/angular-ui/test/test-config.js
#	deleted:    public/bower_components/angular/.bower.json
#	deleted:    public/bower_components/angular/README.md
#	deleted:    public/bower_components/angular/angular-csp.css
#	deleted:    public/bower_components/angular/angular.js
#	deleted:    public/bower_components/angular/angular.min.js
#	deleted:    public/bower_components/angular/angular.min.js.gzip
#	deleted:    public/bower_components/angular/angular.min.js.map
#	deleted:    public/bower_components/angular/bower.json
#	deleted:    public/bower_components/bootstrap/.bower.json
#	deleted:    public/bower_components/bootstrap/Gruntfile.js
#	deleted:    public/bower_components/bootstrap/LICENSE
#	deleted:    public/bower_components/bootstrap/README.md
#	deleted:    public/bower_components/bootstrap/bower.json
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap-theme.css
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap-theme.css.map
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap-theme.min.css
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap.css
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap.css.map
#	deleted:    public/bower_components/bootstrap/dist/css/bootstrap.min.css
#	deleted:    public/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
#	deleted:    public/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
#	deleted:    public/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
#	deleted:    public/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
#	deleted:    public/bower_components/bootstrap/dist/js/bootstrap.js
#	deleted:    public/bower_components/bootstrap/dist/js/bootstrap.min.js
#	deleted:    public/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot
#	deleted:    public/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
#	deleted:    public/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
#	deleted:    public/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff
#	deleted:    public/bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js
#	deleted:    public/bower_components/bootstrap/grunt/bs-lessdoc-parser.js
#	deleted:    public/bower_components/bootstrap/grunt/bs-raw-files-generator.js
#	deleted:    public/bower_components/bootstrap/grunt/shrinkwrap.js
#	deleted:    public/bower_components/bootstrap/js/affix.js
#	deleted:    public/bower_components/bootstrap/js/alert.js
#	deleted:    public/bower_components/bootstrap/js/button.js
#	deleted:    public/bower_components/bootstrap/js/carousel.js
#	deleted:    public/bower_components/bootstrap/js/collapse.js
#	deleted:    public/bower_components/bootstrap/js/dropdown.js
#	deleted:    public/bower_components/bootstrap/js/modal.js
#	deleted:    public/bower_components/bootstrap/js/popover.js
#	deleted:    public/bower_components/bootstrap/js/scrollspy.js
#	deleted:    public/bower_components/bootstrap/js/tab.js
#	deleted:    public/bower_components/bootstrap/js/tooltip.js
#	deleted:    public/bower_components/bootstrap/js/transition.js
#	deleted:    public/bower_components/bootstrap/less/alerts.less
#	deleted:    public/bower_components/bootstrap/less/badges.less
#	deleted:    public/bower_components/bootstrap/less/bootstrap.less
#	deleted:    public/bower_components/bootstrap/less/breadcrumbs.less
#	deleted:    public/bower_components/bootstrap/less/button-groups.less
#	deleted:    public/bower_components/bootstrap/less/buttons.less
#	deleted:    public/bower_components/bootstrap/less/carousel.less
#	deleted:    public/bower_components/bootstrap/less/close.less
#	deleted:    public/bower_components/bootstrap/less/code.less
#	deleted:    public/bower_components/bootstrap/less/component-animations.less
#	deleted:    public/bower_components/bootstrap/less/dropdowns.less
#	deleted:    public/bower_components/bootstrap/less/forms.less
#	deleted:    public/bower_components/bootstrap/less/glyphicons.less
#	deleted:    public/bower_components/bootstrap/less/grid.less
#	deleted:    public/bower_components/bootstrap/less/input-groups.less
#	deleted:    public/bower_components/bootstrap/less/jumbotron.less
#	deleted:    public/bower_components/bootstrap/less/labels.less
#	deleted:    public/bower_components/bootstrap/less/list-group.less
#	deleted:    public/bower_components/bootstrap/less/media.less
#	deleted:    public/bower_components/bootstrap/less/mixins.less
#	deleted:    public/bower_components/bootstrap/less/modals.less
#	deleted:    public/bower_components/bootstrap/less/navbar.less
#	deleted:    public/bower_components/bootstrap/less/navs.less
#	deleted:    public/bower_components/bootstrap/less/normalize.less
#	deleted:    public/bower_components/bootstrap/less/pager.less
#	deleted:    public/bower_components/bootstrap/less/pagination.less
#	deleted:    public/bower_components/bootstrap/less/panels.less
#	deleted:    public/bower_components/bootstrap/less/popovers.less
#	deleted:    public/bower_components/bootstrap/less/print.less
#	deleted:    public/bower_components/bootstrap/less/progress-bars.less
#	deleted:    public/bower_components/bootstrap/less/responsive-utilities.less
#	deleted:    public/bower_components/bootstrap/less/scaffolding.less
#	deleted:    public/bower_components/bootstrap/less/tables.less
#	deleted:    public/bower_components/bootstrap/less/theme.less
#	deleted:    public/bower_components/bootstrap/less/thumbnails.less
#	deleted:    public/bower_components/bootstrap/less/tooltip.less
#	deleted:    public/bower_components/bootstrap/less/type.less
#	deleted:    public/bower_components/bootstrap/less/utilities.less
#	deleted:    public/bower_components/bootstrap/less/variables.less
#	deleted:    public/bower_components/bootstrap/less/wells.less
#	deleted:    public/bower_components/bootstrap/package.json
#	deleted:    public/bower_components/bootstrap/test-infra/README.md
#	deleted:    public/bower_components/bootstrap/test-infra/npm-shrinkwrap.canonical.json
#	deleted:    public/bower_components/bootstrap/test-infra/requirements.txt
#	deleted:    public/bower_components/bootstrap/test-infra/s3_cache.py
#	deleted:    public/bower_components/bootstrap/test-infra/sauce_browsers.yml
#	deleted:    public/bower_components/bootstrap/test-infra/uncached-npm-install.sh
#	deleted:    public/bower_components/jquery/.bower.json
#	deleted:    public/bower_components/jquery/MIT-LICENSE.txt
#	deleted:    public/bower_components/jquery/bower.json
#	deleted:    public/bower_components/jquery/dist/jquery.js
#	deleted:    public/bower_components/jquery/dist/jquery.min.js
#	deleted:    public/bower_components/jquery/dist/jquery.min.map
#	deleted:    public/bower_components/jquery/src/ajax.js
#	deleted:    public/bower_components/jquery/src/ajax/jsonp.js
#	deleted:    public/bower_components/jquery/src/ajax/load.js
#	deleted:    public/bower_components/jquery/src/ajax/parseJSON.js
#	deleted:    public/bower_components/jquery/src/ajax/parseXML.js
#	deleted:    public/bower_components/jquery/src/ajax/script.js
#	deleted:    public/bower_components/jquery/src/ajax/var/nonce.js
#	deleted:    public/bower_components/jquery/src/ajax/var/rquery.js
#	deleted:    public/bower_components/jquery/src/ajax/xhr.js
#	deleted:    public/bower_components/jquery/src/attributes.js
#	deleted:    public/bower_components/jquery/src/attributes/attr.js
#	deleted:    public/bower_components/jquery/src/attributes/classes.js
#	deleted:    public/bower_components/jquery/src/attributes/prop.js
#	deleted:    public/bower_components/jquery/src/attributes/support.js
#	deleted:    public/bower_components/jquery/src/attributes/val.js
#	deleted:    public/bower_components/jquery/src/callbacks.js
#	deleted:    public/bower_components/jquery/src/core.js
#	deleted:    public/bower_components/jquery/src/core/access.js
#	deleted:    public/bower_components/jquery/src/core/init.js
#	deleted:    public/bower_components/jquery/src/core/parseHTML.js
#	deleted:    public/bower_components/jquery/src/core/ready.js
#	deleted:    public/bower_components/jquery/src/core/var/rsingleTag.js
#	deleted:    public/bower_components/jquery/src/css.js
#	deleted:    public/bower_components/jquery/src/css/addGetHookIf.js
#	deleted:    public/bower_components/jquery/src/css/curCSS.js
#	deleted:    public/bower_components/jquery/src/css/defaultDisplay.js
#	deleted:    public/bower_components/jquery/src/css/hiddenVisibleSelectors.js
#	deleted:    public/bower_components/jquery/src/css/support.js
#	deleted:    public/bower_components/jquery/src/css/swap.js
#	deleted:    public/bower_components/jquery/src/css/var/cssExpand.js
#	deleted:    public/bower_components/jquery/src/css/var/getStyles.js
#	deleted:    public/bower_components/jquery/src/css/var/isHidden.js
#	deleted:    public/bower_components/jquery/src/css/var/rmargin.js
#	deleted:    public/bower_components/jquery/src/css/var/rnumnonpx.js
#	deleted:    public/bower_components/jquery/src/data.js
#	deleted:    public/bower_components/jquery/src/data/Data.js
#	deleted:    public/bower_components/jquery/src/data/accepts.js
#	deleted:    public/bower_components/jquery/src/data/var/data_priv.js
#	deleted:    public/bower_components/jquery/src/data/var/data_user.js
#	deleted:    public/bower_components/jquery/src/deferred.js
#	deleted:    public/bower_components/jquery/src/deprecated.js
#	deleted:    public/bower_components/jquery/src/dimensions.js
#	deleted:    public/bower_components/jquery/src/effects.js
#	deleted:    public/bower_components/jquery/src/effects/Tween.js
#	deleted:    public/bower_components/jquery/src/effects/animatedSelector.js
#	deleted:    public/bower_components/jquery/src/event.js
#	deleted:    public/bower_components/jquery/src/event/alias.js
#	deleted:    public/bower_components/jquery/src/event/support.js
#	deleted:    public/bower_components/jquery/src/exports/amd.js
#	deleted:    public/bower_components/jquery/src/exports/global.js
#	deleted:    public/bower_components/jquery/src/intro.js
#	deleted:    public/bower_components/jquery/src/jquery.js
#	deleted:    public/bower_components/jquery/src/manipulation.js
#	deleted:    public/bower_components/jquery/src/manipulation/_evalUrl.js
#	deleted:    public/bower_components/jquery/src/manipulation/support.js
#	deleted:    public/bower_components/jquery/src/manipulation/var/rcheckableType.js
#	deleted:    public/bower_components/jquery/src/offset.js
#	deleted:    public/bower_components/jquery/src/outro.js
#	deleted:    public/bower_components/jquery/src/queue.js
#	deleted:    public/bower_components/jquery/src/queue/delay.js
#	deleted:    public/bower_components/jquery/src/selector-native.js
#	deleted:    public/bower_components/jquery/src/selector-sizzle.js
#	deleted:    public/bower_components/jquery/src/selector.js
#	deleted:    public/bower_components/jquery/src/serialize.js
#	deleted:    public/bower_components/jquery/src/sizzle/dist/sizzle.js
#	deleted:    public/bower_components/jquery/src/sizzle/dist/sizzle.min.js
#	deleted:    public/bower_components/jquery/src/sizzle/dist/sizzle.min.map
#	deleted:    public/bower_components/jquery/src/traversing.js
#	deleted:    public/bower_components/jquery/src/traversing/findFilter.js
#	deleted:    public/bower_components/jquery/src/traversing/var/rneedsContext.js
#	deleted:    public/bower_components/jquery/src/var/arr.js
#	deleted:    public/bower_components/jquery/src/var/class2type.js
#	deleted:    public/bower_components/jquery/src/var/concat.js
#	deleted:    public/bower_components/jquery/src/var/hasOwn.js
#	deleted:    public/bower_components/jquery/src/var/indexOf.js
#	deleted:    public/bower_components/jquery/src/var/pnum.js
#	deleted:    public/bower_components/jquery/src/var/push.js
#	deleted:    public/bower_components/jquery/src/var/rnotwhite.js
#	deleted:    public/bower_components/jquery/src/var/slice.js
#	deleted:    public/bower_components/jquery/src/var/strundefined.js
#	deleted:    public/bower_components/jquery/src/var/support.js
#	deleted:    public/bower_components/jquery/src/var/toString.js
#	deleted:    public/bower_components/jquery/src/var/trim.js
#	deleted:    public/bower_components/jquery/src/wrap.js
#