F1 fresh start
F2 add new change
F1 conflict fix

fix
Revert "F1 conflict fix"

This reverts commit 5a9b43ca62b36d419c732123d0803bd1927c64ea, reversing
changes made to afb72b5619bef4cce22713976c8fdecdee5d96a0.
Revert "F1 conflict fix"

This reverts commit 5a9b43ca62b36d419c732123d0803bd1927c64ea, reversing
changes made to afb72b5619bef4cce22713976c8fdecdee5d96a0.
Revert "F2 add new change"

This reverts commit afb72b5619bef4cce22713976c8fdecdee5d96a0.
F1 fresh start
F2 change addition
F1+F2 second merge
test merge
test merge dev
Merge branch 'DEV' into F1

Conflicts:
	GitHubTest2013_2/Class1.cs
Revert "Merge branch 'DEV' into F1"

This reverts commit f7db0a39dedabba471776115fd95598d47481c7c, reversing
changes made to bb038989d12833f61e85f4ea751c9ce0f4b7b0e7.
Revert "Revert "Merge branch 'DEV' into F1""

This reverts commit 8cb1566a0067e583f0127a29af96f5cc8970b782.
F2 extra change
Merge branch 'F2' into QA
qa stuff
qa stuff