commiting first time
secind
fixing merge issues with file sharing code