Added a test file

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15942]
Changed temp.txt content

[git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15959]
Added ignore files
[#git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15930]

[#git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15931]

[#git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15934]

Add app.xml to gitignore
[#git-p4: depot-paths = "//xFace-Apollo/trunk/proto/v31gitrepo/": change = 15930]

Added a test file
fixed conflict