visualization roughly complete
getting website set up
general cleanup
fixed merge conflicts
fixing merge conflicts