reinitializing with new computer
reinitializing with new computer
Merge branch 'master' of https://github.com/thesrpr/firestarter

Signed-off-by: Corey Ellis <corey@theseniorpartners.com>

Conflicts:
	functions.php
	images/icons.png
	images/icons.svg
	images/loader.gif
	includes/metaboxes/images/ico-delete.png
	includes/metaboxes/images/ui-bg_flat_0_aaaaaa_40x100.png
	includes/metaboxes/images/ui-bg_flat_75_ffffff_40x100.png
	includes/metaboxes/images/ui-bg_glass_55_fbf9ee_1x400.png
	includes/metaboxes/images/ui-bg_glass_65_ffffff_1x400.png
	includes/metaboxes/images/ui-bg_glass_75_dadada_1x400.png
	includes/metaboxes/images/ui-bg_glass_75_e6e6e6_1x400.png
	includes/metaboxes/images/ui-bg_glass_95_fef1ec_1x400.png
	includes/metaboxes/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	includes/metaboxes/images/ui-icons_222222_256x240.png
	includes/metaboxes/images/ui-icons_2e83ff_256x240.png
	includes/metaboxes/images/ui-icons_454545_256x240.png
	includes/metaboxes/images/ui-icons_888888_256x240.png
	includes/metaboxes/images/ui-icons_cd0a0a_256x240.png
	includes/metaboxes/init.php
	includes/metaboxes/js/cmb.js
	includes/metaboxes/js/jquery.timePicker.min.js
	includes/metaboxes/style.css
	includes/options/css/color-picker.min.css
	includes/options/css/optionsframework.css
	includes/options/images/ico-delete.png
	includes/options/js/color-picker.min.js
	includes/options/js/iris.min.js
	includes/options/js/media-uploader.js
	includes/options/js/options-custom.js
	includes/options/options-framework.php
	includes/options/options-interface.php
	includes/options/options-media-uploader.php
	includes/options/options-sanitize.php
	js/jquery-timing.min.js
	js/jquery.swipebox.min.js
	js/selectivizr-min.js
	scss/_font-awesome.scss
	scss/_foundation.scss
	scss/_normalize.scss
	scss/bourbon/_bourbon.scss
	scss/colors/_ambers.scss
	scss/colors/_blues.scss
	scss/colors/_bootstrap.scss
	scss/colors/_browns.scss
	scss/colors/_colors.scss
	scss/colors/_grays.scss
	scss/colors/_greens.scss
	scss/colors/_limes.scss
	scss/colors/_oranges.scss
	scss/colors/_peaches.scss
	scss/colors/_pinks.scss
	scss/colors/_purples.scss
	scss/colors/_reds.scss
	scss/colors/_tans.scss
	scss/colors/_turquoise.scss
	scss/colors/_whites.scss
	scss/colors/_yellows.scss
	scss/foundation/_variables.scss
	scss/foundation/components/_alert-boxes.scss
	scss/foundation/components/_block-grid.scss
	scss/foundation/components/_breadcrumbs.scss
	scss/foundation/components/_button-groups.scss
	scss/foundation/components/_buttons.scss
	scss/foundation/components/_clearing.scss
	scss/foundation/components/_custom-forms.scss
	scss/foundation/components/_dropdown-buttons.scss
	scss/foundation/components/_dropdown.scss
	scss/foundation/components/_flex-video.scss
	scss/foundation/components/_forms.scss
	scss/foundation/components/_global.scss
	scss/foundation/components/_grid.scss
	scss/foundation/components/_inline-lists.scss
	scss/foundation/components/_joyride.scss
	scss/foundation/components/_keystrokes.scss
	scss/foundation/components/_labels.scss
	scss/foundation/components/_magellan.scss
	scss/foundation/components/_orbit.scss
	scss/foundation/components/_pagination.scss
	scss/foundation/components/_panels.scss
	scss/foundation/components/_pricing-tables.scss
	scss/foundation/components/_progress-bars.scss
	scss/foundation/components/_reveal.scss
	scss/foundation/components/_section.scss
	scss/foundation/components/_side-nav.scss
	scss/foundation/components/_split-buttons.scss
	scss/foundation/components/_sub-nav.scss
	scss/foundation/components/_switch.scss
	scss/foundation/components/_tables.scss
	scss/foundation/components/_thumbs.scss
	scss/foundation/components/_tooltips.scss
	scss/foundation/components/_top-bar.scss
	scss/foundation/components/_type.scss
	scss/foundation/components/_visibility.scss