init
merge .gitignore with GitHub version

Merge branch 'master' of github.com:svlasov/assignment3

Conflicts:
	.gitignore