committing the final solution to the assignment.
 Fixed some issues with conflicts between local version and remote github
version. the problems come from that I screwed up when creating the
directory (did git init after all changes were done just before trying to
commit)
Merge https://github.com/drlundgren/ProgrammingAssignment2

Conflicts:
	cachematrix.R