merging unfinished page
removing uncategorized, now replaced by unfinished
Merge pull request #41 from lmccart/master

	merging unfinished page