modified show and edit blades, added high_price to DevicesController
Merge pull request #29 from 210geeks/ryan

modified show and edit blades, added high_price to DevicesController
added jquery code for high price calculator
Merge pull request #30 from 210geeks/Joseph

added jquery code for high price calculator
more work on edit page-refurb technician form
Merge branch 'master' into ryan
manufacturer commented out in devicescontroller
set manufacturer on device table to update
Merge pull request #31 from 210geeks/ryan

manufacturer field on device table is posting from create/buy-back form
added inputs to create device form and changed nav
Merge pull request #32 from 210geeks/Joseph

added inputs to create device form and changed nav
edit blade further edits
Merge pull request #33 from 210geeks/ryan

everything on edit blade done except cost summation JS and styling
associative table first draft
added bootstrap to local directory
Merge pull request #34 from 210geeks/Joseph

added bootstrap to local directory
devices controller saving to associative tables
Merge pull request #35 from 210geeks/ryan

associative tables are associating now