Updating index file
Updating about file
Merge remote-tracking branch 'upstream/master'