Merge conflicts
Merge pull request #14 from jaksah/l2-norm

Merge conflicts