created gitignore
Merge branch 'master' of github.com:jwill49/fall2014

Conflicts:
	.gitignore