Filling app with Holy Spirit
Filling app with Holy Spirit
Conflicts:
	authors.txt
Merge in Jon's changes

Conflicts:
	authors.txt