Reset to master
Merge branch 'master' into Kyle's-Branch
Merge branch 'master' into Kyle's-Branch
Merge branch 'master' into Kyle's-Branch
Added inf norm and two norm functionality
Merge branch 'Kyle's-Branch'
Merge branch 'master' into Ben's-Branch