other files
init files
Merge branch 'master' of https://github.com/jaggs6/InsulinLogger

Conflicts:
	.gitignore