s
Merge remote-tracking branch 'origin/master'

Conflicts:
	Coursework/src/bibleApp/TextReader.java