coursera programming assignment - edit
Merge branch 'master' of https://github.com/pcogiel/ProgrammingAssignment2

Conflicts:
	cachematrix.R