cosmetic changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/gsu/cs/align/model/InsertionsAligner.scala
	src/edu/gsu/cs/align/model/WindowSlicer.scala