Added TheNewFile.txt
Merge branch 'master' into aerotest_dev
Merge branch 'master' into aerotest_dev
Added anewfile.txt
Re-add anewfile.txt
Remove anewfile.txt
Merge branch 'master' into aerotest_dev
Merge branch 'master' into aerotest_dev
Minor update to test merging into trunk