Removed some repeated code
Added some upgrades for salaried employees
Changed ergonomic keyboards to a new category called hardware and made ergonomic keyboards the first upgrade you can buy for them
Upgrades for HR Department and Upper Management now.  Both of them are very mean....please don't hate me.  They're mostly a joke :)
More upgrades
Some styling updates
More items and tried to balance and switch some things around, but I really have no idea what to do when it comes to balancing :)
Updated upgrades page to show what item the upgrade applies to and how much it adds
Only show upgrades for items you've already bought
Merge branch 'master' into unit_tests