Project Setup
Merge branch 'master' of github.com:rjones87/slc

Conflicts:
	.gitignore