a
Merge branch 'master' of github.com:Aldor007/Inftech
a
B
Merge branch 'master' of github.com:Aldor007/Inftech

Conflicts: