New commit info.txt in master
Merged master fixed conflict