Remove extraneous comments
Merge remote-tracking branch 'origin/feature-b'

Conflicts:
	src/main/java/com/ambientideas/App.java