Merge branch 'working'

Conflicts:
	app/src/main/java/scd/com/mediamatrix/MatrixInitialization.java
	app/src/main/java/scd/com/mediamatrix/SortAndFill.java