initial commit
Merge branch 'master' of github.com:KyleMacey/reporting

Conflicts:
	.gitignore