Merge pull request #40 from lmccart/master

fixing admin lost page
merging unfinished page
removing uncategorized, now replaced by unfinished