Updated the gitignore file
Updated the gitignore file
Merge remote-tracking branch 'upstream/master' into updategitignore
Merge branch 'master' of https://github.com/matthewrice345/CanvasAPI into updategitignore

Conflicts:
	.gitignore
Gitignore update

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

Conflicts:
	.gitignore
Merge pull request #57 from matthewrice345/master

Updated the gitignore file