remove extraneous files
Brand refactor:
  Views:
    _form.html.erb: add blankline between div siblings
    _form.html.erb: fix indenting
    _table.html.erb: fix indenting
    _table.html.erb: break up link_to blocks onto separate lines
    edit.html.erb: remove endlines
    index.html.erb: remove role: button in link_to new_brand_path
    index.html.erb: add whitespace surrounding hash
    new.html.erb: remove trailing endlines
Color Refactor:
  Model:
    Reorganize layout

  Views:
    _form.html.erb: fix indentation
    _form.html.erb: broke button_tag into separate lines
    _form.html.erb: fix <p> tags not having closing tag
    _form.html.erb: add spacing between sibling divs
    _table.html.erb: remove trailing and leading line breaks
    _table.html.erb: fix indentation
    _table.html.erb: add space between sibling link_to's
    _table.html.erb: alphabetize html_options hash for second link_to
    edit.html.erb: remove trailing line breaks
    index.html.erb: remove role: button to link_to new_color_path
    index.html.erb: add spacing between div siblings
    index.html.erb: add spacing in locals hash
Refactored payment_status in Order model. Shortened from 30+ lines to less than 20. Stil over 10 lines of code, but much cleaner than before.
Merge branch 'style-project-nick' into style-project

Conflicts:
	app/models/order.rb
Fix syntax error in commented out code (lol)
Refactored/styled Stores:

For Model, nothing

For Views, general formatting

For Controller, removed TODO since ? sanitizes sql for where
Merge branch 'style-project-nick' into style-project
Refactor Imprintable:
  Controller:
    refactor index to use ternary expression with assignment
    remove parenthesis from update's ternary expression
    improve safety of update_imprintable_variants
    modify styling of permitted params
    refactor set_variant_hash to only share one instance
      variable between controller and views
  Model:
    reorganize validations
    enforce 80 char limit
    refactor #create_impritnable_variants_from_sizes_and_colors
      to #create_imprintable_variants
    refactor determine_sizes
    refactor variants to be a class method
  View:
    _basic_info.html.erb: replace <br> tags with <p> tags
    _basic_info.html.erb: include line breaks between siblings
    _form.html.erb: fix indentation
    _form.html.erb: replace collect with map
    _form.html.erb: enforce 80 char line limit
    _form.html.erb: refactor basic_information, imprint_information,
      supplier_information into partials, update spec
    _basic_information_form.html.erb: refactor out interaction with model layer
    _grid.html.erb: refactor out interaction with model layer
    _grid.html.erb: refactor css classes and it's to user dash instead of underscore
    _imprint_details.html.erb: replace <br> tags with <p>
    _imprint_details.html.erb: refactor map to use (&:attribute) format
    _imprintable_category_fields.html.erb: enforce 80 char line limit
    _size_color_availability.html.erb: fix indentation
    _size_color_availability.html.erb: expand td
    _table.html.erb: expand out link_to statements
    _table.html.erb: expand out td element
    _table.html.erb: add spaces between hash in link_to
    _table.html.erb alphabetize html_options in link_to
    _table.html.erb: refactor out inline style
    _variant_select.html.erb: refactor out model layer interaction
    edit.html.erb: remove local assignment
    index.html.erb: remove role: button from link_to
    index.html.erb: add spacing between div elements
    index.html.erb: clean up render partial call
  Helper:
    refactor table_entries to use join
Imprintable Categories Refactor
  Model:
    clean up validates statements
Refactored/styled Sizes:

For Model, refactored set_sort_order

For Views, general formatting and removed role: 'button' from all views in project

For Controller, replaced update_attribute with update because former doesn't call validations

For Coffeescript, switched from js to coffeescript, fixed indentation issues and provided more descriptive variable names

For CSS, removed custom css from html file and created sizes.css.scss
Merge branch 'style-project-nick' into style-project
Refactored/styled Payments:

For Model, ensured is_refunded? works

For Views, added TODO in _payment_form about needing to figure out how to remove inline javascript, also general formatting

For Controller, formated permitted_params

For CSS, created payments.css.scss for payment-buttons styling and created .max-width in style.css.scss for setting width to 100%
Merge branch 'style-project-nick' into style-project
Refactored/styled Prices:

For Views, removed irrelevant custom ids and general formatting

For Controller, removed destroy_all and put inside of destroy
Fixed some issues with Quotes feature spec
Styled Proofs:

For Model, organized layout

For Views, general formatting

For Controller, refactored approved?

For Coffeescript, extracted general code to global.js.coffee

For Mailer, refactored to use hash and abstracted into smaller methods

Also, moved format_time into ApplicationsController and formatted Controllers that used it accordingly
Imprintable Variant Refactor (mostly Imprintable related)

Imprintable:
  Coffeescript:
    refactor out block of raw javascript
    rename variables within functions
    reorganize file with function definitions at top and bindings below
    refactor variant selection to work with chosen-select
    shorten submit button function

Remove chosen_helpers.rb (duplicate method definitions)
Merge branch 'style-project' of https://github.com/AnnArborTees/softwear-crm into style-project-david

Conflicts:
	app/views/imprintables/index.html.erb
Styled Proofs:

For Model, organized layout

For Views, general formatting

For Controller, refactored approved?

For Coffeescript, extracted general code to global.js.coffee

For Mailer, refactored to use hash and abstracted into smaller methods

Also, moved format_time into ApplicationsController and formatted Controllers that used it accordingly