initial main
change a
change b
Merge branch 'DevB'

Conflicts:
	App.cs
Merge branch 'master' of https://github.com/Izzzo/HelloGit