copied html template to stock
Merge branch 'nk' of github.com:walterm/barkeeper into katie
Merge branch 'master' of github.com:walterm/barkeeper into katie
Merge branch 'master' of github.com:walterm/barkeeper into katie
Added update stock page
Fixed merge
Merge pull request #3 from walterm/katie

Katie