git hub test
Git ignore changes
Merge branch 'master' of github.com:ethno2405/Samodiva

Conflicts:
	Samodiva.suo
	Samodiva.v11.suo