Gitignore update

Conflicts:
	.gitignore
Updated the gitignore
Merge branch 'master' of https://github.com/matthewrice345/CanvasAPI into updategitignore

Conflicts:
	.gitignore