removed ribbon from index.html, final cleanup
Resolving pull request conflict, remerging origin master