Added a new feature. On a branch
Merge branch 'master' of github.com:omsharp/branchingtest

Conflicts:
	Form1.Designer.cs
Assing a new feature Class