added license, about page changes
merged about.html conflict