Merge branch 'github/master'
Merge branch 'chris'
Github junk in file
Fix index
Merge branch 'master'