theme change
cleaning up master, project will live in gh-pages I think
merge fix