edited readme
fixed conflicts
hard-coded about section in sidebar.html