add feature descriptions to about page
merge
bad merge fix
moar merging