Merge branch 'master' of github.com:TJkrusinski/high-factors

Conflicts:
	.gitignore