changes to somefile.c
added test.c
made some other changes
fiex the broken email address
some other required changes to index.html
fixed index.html and test.c conflicts
more changes to index.html
Merge branch 'testing'
index.html and more
index.html and something more
merged index.html with version in testing