Merge branch 'issue-015' into develop
removed Gemfile.lock
Split up if statement in set_pixi_path method
Restored to original method logic
Merge branch 'develop' of github.com:sdbmich1/plumboard into approving-pixi-issue-052214
Changed the hardcoded http to https
Added rspec tests for to_csv method
DRY-ed up rspec test
Made second rspec test pass
DRY-ed up rspec tests
Deleted unnecessary lines
Merge branch 'develop' of github.com:sdbmich1/plumboard into users-list-page-update-051814
Changed the content of the send_interest.html.erb file
Consolidated electronics categories into one category
send_approval.html.erb is modified to encurage users to use Social Websites to shared
Changed old csv file photo pic file name to lowercase
Synced category pics and csv data file to what's on pixiboard.com
Changed electronic pic
Merge branch 'develop' of github.com:sdbmich1/plumboard into category-images-update-042214
Created pixi_terms.html from scratch to make it to correspond with the .doc version and be easier to change in the future