Conflicts:
	assignments/nbproject/build-impl.xml
	assignments/nbproject/project.properties
	examples/nbproject/build-impl.xml