Merge pull request #2 from is603fa14/dev

Merge DEV changes back into MASTER
Merge pull request #8 from is603fa14/dev

Merge DEV into master
Merge branch 'dev' of github.com:thierer1/is603-inventory-dss-1
Merge branch 'dev' of github.com:thierer1/is603-inventory-dss-1
Merge branch 'master' of github.com:is603fa14/is603-inventory-dss
Merge branch 'master' of heroku.com:gentle-plateau-4030
Merge branch 'dev' of github.com:thierer1/is603-inventory-dss-1
Merge pull request #11 from is603fa14/dev

Merge dev into master
Merge branch 'master' of github.com:is603fa14/is603-inventory-dss
Merge pull request #13 from is603fa14/dev

Merge dev into master
Merge branch 'master' of github.com:is603fa14/is603-inventory-dss
Merge pull request #14 from thierer1/dev

Finalize homepage and design
Merge branch 'master' of github.com:is603fa14/is603-inventory-dss
Merge branch 'master' of heroku.com:gentle-plateau-4030