random local changes
merge conflicts fixed
Changed trial1 and gitignorelist