Gitignored config
Merge branch 'master' of github.com:tylermadsen/CircleLineProjects

Conflicts:
	.gitignore