First commit readme.txt
Second commit: included Text1.txt
After modifying readme.txt
modified both files
added readme.txt
created file_conflict
Merge branch 'master' of github.com:Gannon-University/gcis634.2014.team3