Add magFile.txt
Merge branch 'magbranch'