commit 21/12/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	cachematrix.R