added change to padraig.txt
small update to check merge/conflict
update to team1 branch with a third line
update to 3way branch that I save
ALL DONE
master branch update
master branch update