commit to local development branch
commit to local master branch
Merge branch 'development'

Conflicts:
	testprj/src/testprj/FileWriter.java
conflict resolved