Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Coursework/src/bibleApp/Controller.java