finished v.1.1
Merge branch 'master-old'

Conflicts:
	alg-one/src/week/one/assignment/Percolation.java
	alg-one/src/week/one/assignment/PercolationStats.java
finished version v.1.1