Added file submission on server with file revision tracker
Merged conflict on index.html