add files to .gitignore
Merge branch 'master' of github.com:micfort/2IV05

Conflicts:
	.gitignore