Changed the file to txt
Commit to master
20141022 - Made a change on the master branch
20141022 - Created my own  branch
20141022 - Created a new file
Merge remote-tracking branch 'remotes/origin/Test1' into Test2

Conflicts:
	README.md
	Sample.txt