ignored bin and obj folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 2f06952177da96c9ee877c2905e2a33efdb0ad0a.
Added vs project
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore