2013.10.21.10.46

First Commit Ray
2013.10.21.10.54

Second Commit
2013.10.21.11.01-Ray

Third Commit
2013.10.21.11.29-Joshua

remove test.txt files
Merge remote-tracking branch 'origin/Joshua'