Get all of the changes from master

Conflicts:
	examples/src/main/java/edu/pdx/cs410J/core/WriteToFile.java