initialize repository
Merge branch 'master' of https://github.com/jjwright55/test_water_sample

Conflicts:
	.gitignore