fixing admin lost page
fixing botched merge
Merge pull request #40 from lmccart/master

fixing admin lost page