F1 fresh start
Revert "Merge branch 'F2' into QA"

This reverts commit 932d23fa86050915e94fc4e3277a185c2b03053e, reversing
changes made to 249d9d9b395498fce707f171eda1879da2a0a122.

Merge branch 'F2' into QA

Revert "Revert "Merge branch 'DEV' into F1""

This reverts commit
8cb1566a0067e583f0127a29af96f5cc8970b782.

Revert "Merge branch 'DEV' into F1"

This reverts commit
f7db0a39dedabba471776115fd95598d47481c7c, reversing
changes made to
bb038989d12833f61e85f4ea751c9ce0f4b7b0e7.

Merge branch 'DEV' into F1

Conflicts:
	GitHubTest2013_2/Class1.cs

test merge

F1+F2 second merge

F2 change addition

Revert "F1 conflict fix"

This reverts commit
5a9b43ca62b36d419c732123d0803bd1927c64ea, reversing
changes made to
afb72b5619bef4cce22713976c8fdecdee5d96a0.

F1 conflict fix

fix

F2 add new change