Filling app with Holy Spirit
Merging in Jon's pull request
Filling app with Holy Spirit
Conflicts:
	authors.txt