First commit of some spike work sans testing.
Merge branch 'master' of github.com:chazelton331/masterthecount

Conflicts:
	.gitignore