git ignore
Merge branch 'refactor-to-galvanize'

Conflicts:
	.DS_Store
	lifeteen-database/.DS_Store
Merge remote-tracking branch 'origin/master' into updates